src/patches/suse-2.6.27.31/patches.suse/reiserfs-remove-i_has_xattr_dir.diff

   1 From: Jeff Mahoney <jeffm@suse.com>
   2 Subject: reiserfs: remove i_has_xattr_dir
   3
   4  With the changes to xattr root locking, the i_has_xattr_dir flag
   5  is no longer needed. This patch removes it.
   6
   7 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
   8
   9 ---
  10  fs/reiserfs/xattr.c |    9 +--------
  11  1 file changed, 1 insertion(+), 8 deletions(-)
  12
  13 --- a/fs/reiserfs/xattr.c
  14 +++ b/fs/reiserfs/xattr.c
  15 @@ -459,10 +459,7 @@ int reiserfs_delete_xattrs(struct inode
  16
  17         dput(root);
  18  out:
  19 -       if (!err)
  20 -               REISERFS_I(inode)->i_flags =
  21 -                   REISERFS_I(inode)->i_flags & ~i_has_xattr_dir;
  22 -       else
  23 +       if (err)
  24                 reiserfs_warning(inode->i_sb, "jdm-20004",
  25                                  "Couldn't remove all xattrs (%d)\n", err);
  26         return err;
  27 @@ -660,7 +657,6 @@ reiserfs_xattr_set(struct inode *inode,
  28         down_write(&REISERFS_I(inode)->i_xattr_sem);
  29
  30         xahash = xattr_hash(buffer, buffer_size);
  31 -       REISERFS_I(inode)->i_flags |= i_has_xattr_dir;
  32
  33         /* Resize it so we're ok to write there */
  34         newattrs.ia_size = buffer_size;
  35 @@ -769,7 +765,6 @@ reiserfs_xattr_get(const struct inode *i
  36         down_read(&REISERFS_I(inode)->i_xattr_sem);
  37
  38         isize = i_size_read(dentry->d_inode);
  39 -       REISERFS_I(inode)->i_flags |= i_has_xattr_dir;
  40
  41         /* Just return the size needed */
  42         if (buffer == NULL) {
  43 @@ -999,8 +994,6 @@ ssize_t reiserfs_listxattr(struct dentry
  44         buf.r_pos = 0;
  45         buf.r_inode = dentry->d_inode;
  46
  47 -       REISERFS_I(dentry->d_inode)->i_flags |= i_has_xattr_dir;
  48 -
  49         mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_XATTR);
  50         err = xattr_readdir(dir->d_inode, reiserfs_listxattr_filler, &buf);
  51         mutex_unlock(&dir->d_inode->i_mutex);