aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2009-03-30 14:02:37 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 15:16:38 -0400
commit8ecbe550a142fe604874afa477ea68986f89b86c (patch)
tree3b11a69188137b478894f24079b8cc56df7843b3 /fs/reiserfs
parent8b6dd72a441a683cef7ace93de0a57ced4367f00 (diff)
reiserfs: remove i_has_xattr_dir
With the changes to xattr root locking, the i_has_xattr_dir flag is no longer needed. This patch removes it. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/xattr.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index ccb8e4d4c032..8d7e5d9ae17c 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -459,10 +459,7 @@ int reiserfs_delete_xattrs(struct inode *inode)
459 459
460 dput(root); 460 dput(root);
461out: 461out:
462 if (!err) 462 if (err)
463 REISERFS_I(inode)->i_flags =
464 REISERFS_I(inode)->i_flags & ~i_has_xattr_dir;
465 else
466 reiserfs_warning(inode->i_sb, "jdm-20004", 463 reiserfs_warning(inode->i_sb, "jdm-20004",
467 "Couldn't remove all xattrs (%d)\n", err); 464 "Couldn't remove all xattrs (%d)\n", err);
468 return err; 465 return err;
@@ -660,7 +657,6 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer,
660 down_write(&REISERFS_I(inode)->i_xattr_sem); 657 down_write(&REISERFS_I(inode)->i_xattr_sem);
661 658
662 xahash = xattr_hash(buffer, buffer_size); 659 xahash = xattr_hash(buffer, buffer_size);
663 REISERFS_I(inode)->i_flags |= i_has_xattr_dir;
664 660
665 /* Resize it so we're ok to write there */ 661 /* Resize it so we're ok to write there */
666 newattrs.ia_size = buffer_size; 662 newattrs.ia_size = buffer_size;
@@ -769,7 +765,6 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer,
769 down_read(&REISERFS_I(inode)->i_xattr_sem); 765 down_read(&REISERFS_I(inode)->i_xattr_sem);
770 766
771 isize = i_size_read(dentry->d_inode); 767 isize = i_size_read(dentry->d_inode);
772 REISERFS_I(inode)->i_flags |= i_has_xattr_dir;
773 768
774 /* Just return the size needed */ 769 /* Just return the size needed */
775 if (buffer == NULL) { 770 if (buffer == NULL) {
@@ -999,8 +994,6 @@ ssize_t reiserfs_listxattr(struct dentry * dentry, char *buffer, size_t size)
999 buf.r_pos = 0; 994 buf.r_pos = 0;
1000 buf.r_inode = dentry->d_inode; 995 buf.r_inode = dentry->d_inode;
1001 996
1002 REISERFS_I(dentry->d_inode)->i_flags |= i_has_xattr_dir;
1003
1004 mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_XATTR); 997 mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_XATTR);
1005 err = xattr_readdir(dir->d_inode, reiserfs_listxattr_filler, &buf); 998 err = xattr_readdir(dir->d_inode, reiserfs_listxattr_filler, &buf);
1006 mutex_unlock(&dir->d_inode->i_mutex); 999 mutex_unlock(&dir->d_inode->i_mutex);