Hopefully this is not wordwrapped this time...
From: Ryan Hope <rmh3093@gmail.com>
Date: Fri, 1 Aug 2008 13:25:28 +0000 (-0400)
Subject: cleanup reiser4 warnings
X-Git-Url:
http://zen-sources.org/cgi-bin/gitweb.cgi?p=kernel.git;a=commitdiff_plain;h=675342fe83...
cleanup reiser4 warnings
---
diff --git a/fs/reiser4/plugin/file/cryptcompress.c
b/fs/reiser4/plugin/file/cryptcompress.c
index 2e64374..7d3061d 100644
--- a/fs/reiser4/plugin/file/cryptcompress.c
+++ b/fs/reiser4/plugin/file/cryptcompress.c
@@ -821,7 +821,7 @@ static int need_cut_or_align(struct inode * inode,
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 --git a/fs/reiser4/plugin/inode_ops.c b/fs/reiser4/plugin/inode_ops.c
index 6ac4d13..945a740 100644
--- a/fs/reiser4/plugin/inode_ops.c
+++ b/fs/reiser4/plugin/inode_ops.c
@@ -418,8 +418,7 @@ void *reiser4_follow_link_common(struct dentry
*dentry, struct nameidata *nd)
*
* 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 --git a/fs/reiser4/plugin/object.h b/fs/reiser4/plugin/object.h
index 63abb07..88a53a5 100644
--- a/fs/reiser4/plugin/object.h
+++ b/fs/reiser4/plugin/object.h
@@ -25,8 +25,7 @@ int reiser4_mknod_common(struct inode *parent, struct
dentry *dentry,
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 *);
--
