From: "Ryan Hope" Clean up some reiser4 compile warnings: Cc: Edward Shishkin Signed-off-by: Andrew Morton --- fs/reiser4/plugin/file/cryptcompress.c | 2 +- fs/reiser4/plugin/inode_ops.c | 3 +-- fs/reiser4/plugin/object.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff -puN fs/reiser4/plugin/file/cryptcompress.c~reiser4-compile-warning-cleanups fs/reiser4/plugin/file/cryptcompress.c --- a/fs/reiser4/plugin/file/cryptcompress.c~reiser4-compile-warning-cleanups +++ a/fs/reiser4/plugin/file/cryptcompress.c @@ -821,7 +821,7 @@ static int need_cut_or_align(struct inod static void align_or_cut_overhead(struct inode * inode, struct cluster_handle * ch, rw_op rw) { - int oh; + unsigned int oh; cipher_plugin * cplug = inode_cipher_plugin(inode); assert("edward-1402", need_cipher(inode)); diff -puN fs/reiser4/plugin/inode_ops.c~reiser4-compile-warning-cleanups fs/reiser4/plugin/inode_ops.c --- a/fs/reiser4/plugin/inode_ops.c~reiser4-compile-warning-cleanups +++ a/fs/reiser4/plugin/inode_ops.c @@ -418,8 +418,7 @@ void *reiser4_follow_link_common(struct * * Uses generic function to check for rwx permissions. */ -int reiser4_permission_common(struct inode *inode, int mask, - struct nameidata *nameidata) +int reiser4_permission_common(struct inode *inode, int mask) { return generic_permission(inode, mask, NULL); } diff -puN fs/reiser4/plugin/object.h~reiser4-compile-warning-cleanups fs/reiser4/plugin/object.h --- a/fs/reiser4/plugin/object.h~reiser4-compile-warning-cleanups +++ a/fs/reiser4/plugin/object.h @@ -25,8 +25,7 @@ int reiser4_mknod_common(struct inode *p int reiser4_rename_common(struct inode *old_dir, struct dentry *old_name, struct inode *new_dir, struct dentry *new_name); void *reiser4_follow_link_common(struct dentry *, struct nameidata *data); -int reiser4_permission_common(struct inode *, int mask, - struct nameidata *nameidata); +int reiser4_permission_common(struct inode *, int mask); int reiser4_setattr_common(struct dentry *, struct iattr *); int reiser4_getattr_common(struct vfsmount *mnt, struct dentry *, struct kstat *); _