X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=fs%2Ffreevxfs%2Fvxfs_immed.c;h=8a5959a61ba9dbff4b9b713efa1f5d42da003e1f;hb=4f4ae0d42680889c62db4e1f3e6b4aa7787a7257;hp=d0401dc68d41306cef3781de18e9ac18ef7ad306;hpb=e3e3679cfc1c6689e035f6d69606253b1eda63ca;p=cascardo%2Flinux.git diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c index d0401dc68d41..8a5959a61ba9 100644 --- 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. */ -struct inode_operations vxfs_immed_symlink_iops = { +const struct inode_operations vxfs_immed_symlink_iops = { .readlink = generic_readlink, .follow_link = vxfs_immed_follow_link, }; /* - * Adress space operations for immed files and directories. + * Address 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, }; @@ -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); - 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);