git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[pandora-kernel.git]
/
fs
/
freevxfs
/
vxfs_immed.c
diff --git
a/fs/freevxfs/vxfs_immed.c
b/fs/freevxfs/vxfs_immed.c
index
d0401dc
..
8a5959a
100644
(file)
--- a/
fs/freevxfs/vxfs_immed.c
+++ b/
fs/freevxfs/vxfs_immed.c
@@
-48,15
+48,15
@@
static int vxfs_immed_readpage(struct file *, struct page *);
* Unliked all other operations we do not go through the pagecache,
* but do all work directly on the inode.
*/
* Unliked all other operations we do not go through the pagecache,
* but do all work directly on the inode.
*/
-struct inode_operations vxfs_immed_symlink_iops = {
+
const
struct inode_operations vxfs_immed_symlink_iops = {
.readlink = generic_readlink,
.follow_link = vxfs_immed_follow_link,
};
/*
.readlink = generic_readlink,
.follow_link = vxfs_immed_follow_link,
};
/*
- * Adress space operations for immed files and directories.
+ * Ad
d
ress space operations for immed files and directories.
*/
*/
-struct address_space_operations vxfs_immed_aops = {
+
const
struct address_space_operations vxfs_immed_aops = {
.readpage = vxfs_immed_readpage,
};
.readpage = vxfs_immed_readpage,
};
@@
-99,8
+99,8
@@
static int
vxfs_immed_readpage(struct file *fp, struct page *pp)
{
struct vxfs_inode_info *vip = VXFS_INO(pp->mapping->host);
vxfs_immed_readpage(struct file *fp, struct page *pp)
{
struct vxfs_inode_info *vip = VXFS_INO(pp->mapping->host);
- u_int64_t
offset =
pp->index << PAGE_CACHE_SHIFT;
- caddr_t
kaddr;
+ u_int64_t
offset = (u_int64_t)
pp->index << PAGE_CACHE_SHIFT;
+ caddr_t kaddr;
kaddr = kmap(pp);
memcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_CACHE_SIZE);
kaddr = kmap(pp);
memcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_CACHE_SIZE);