From: Christoph Hellwig This function is completely unused since the xattr permission checking changes. Remove it and fold __reiserfs_permission into reiserfs_permission. Signed-off-by: Christoph Hellwig Cc: Jeff Mahoney Cc: Chris Mason Signed-off-by: Andrew Morton --- fs/reiserfs/xattr.c | 30 ++++++++---------------------- include/linux/reiserfs_xattr.h | 2 -- 2 files changed, 8 insertions(+), 24 deletions(-) diff -puN fs/reiserfs/xattr.c~reiserfs-remove-reiserfs_permission_locked fs/reiserfs/xattr.c --- devel/fs/reiserfs/xattr.c~reiserfs-remove-reiserfs_permission_locked 2006-01-15 23:32:01.000000000 -0800 +++ devel-akpm/fs/reiserfs/xattr.c 2006-01-15 23:32:01.000000000 -0800 @@ -1319,9 +1319,7 @@ int reiserfs_xattr_init(struct super_blo return err; } -static int -__reiserfs_permission(struct inode *inode, int mask, struct nameidata *nd, - int need_lock) +int reiserfs_permission(struct inode *inode, int mask, struct nameidata *nd) { umode_t mode = inode->i_mode; @@ -1357,15 +1355,14 @@ __reiserfs_permission(struct inode *inod if (!(mode & S_IRWXG)) goto check_groups; - if (need_lock) { - reiserfs_read_lock_xattr_i(inode); - reiserfs_read_lock_xattrs(inode->i_sb); - } + reiserfs_read_lock_xattr_i(inode); + reiserfs_read_lock_xattrs(inode->i_sb); + acl = reiserfs_get_acl(inode, ACL_TYPE_ACCESS); - if (need_lock) { - reiserfs_read_unlock_xattrs(inode->i_sb); - reiserfs_read_unlock_xattr_i(inode); - } + + reiserfs_read_unlock_xattrs(inode->i_sb); + reiserfs_read_unlock_xattr_i(inode); + if (IS_ERR(acl)) { if (PTR_ERR(acl) == -ENODATA) goto check_groups; @@ -1414,14 +1411,3 @@ __reiserfs_permission(struct inode *inod return -EACCES; } - -int reiserfs_permission(struct inode *inode, int mask, struct nameidata *nd) -{ - return __reiserfs_permission(inode, mask, nd, 1); -} - -int -reiserfs_permission_locked(struct inode *inode, int mask, struct nameidata *nd) -{ - return __reiserfs_permission(inode, mask, nd, 0); -} diff -puN include/linux/reiserfs_xattr.h~reiserfs-remove-reiserfs_permission_locked include/linux/reiserfs_xattr.h --- devel/include/linux/reiserfs_xattr.h~reiserfs-remove-reiserfs_permission_locked 2006-01-15 23:32:01.000000000 -0800 +++ devel-akpm/include/linux/reiserfs_xattr.h 2006-01-15 23:32:01.000000000 -0800 @@ -43,8 +43,6 @@ int reiserfs_delete_xattrs(struct inode int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs); int reiserfs_xattr_init(struct super_block *sb, int mount_flags); int reiserfs_permission(struct inode *inode, int mask, struct nameidata *nd); -int reiserfs_permission_locked(struct inode *inode, int mask, - struct nameidata *nd); int reiserfs_xattr_del(struct inode *, const char *); int reiserfs_xattr_get(const struct inode *, const char *, void *, size_t); _