reiserfs: remove reiserfs_permission_locked
PATCH 1/2 reiserfs: remove reiserfs_permission_locked
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 <[email protected]>
fs/reiserfs/xattr.c +8 -22
@@ -1319,9 +1319,7 @@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 @@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 @@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 ); -}
include/linux/reiserfs_xattr.h +0 -2
@@ -43,8 +43,6 @@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 );