[patch 22/35 xattr-rework] reiserfs: remove i_has_xattr_dir

From: Jeff Mahoney
Date: Mon Mar 30 2009 - 14:18:26 EST


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@xxxxxxxx>

---
fs/reiserfs/xattr.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)

--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -459,10 +459,7 @@ int reiserfs_delete_xattrs(struct inode

dput(root);
out:
- if (!err)
- REISERFS_I(inode)->i_flags =
- REISERFS_I(inode)->i_flags & ~i_has_xattr_dir;
- else
+ if (err)
reiserfs_warning(inode->i_sb, "jdm-20004",
"Couldn't remove all xattrs (%d)\n", err);
return err;
@@ -660,7 +657,6 @@ reiserfs_xattr_set(struct inode *inode,
down_write(&REISERFS_I(inode)->i_xattr_sem);

xahash = xattr_hash(buffer, buffer_size);
- REISERFS_I(inode)->i_flags |= i_has_xattr_dir;

/* Resize it so we're ok to write there */
newattrs.ia_size = buffer_size;
@@ -769,7 +765,6 @@ reiserfs_xattr_get(const struct inode *i
down_read(&REISERFS_I(inode)->i_xattr_sem);

isize = i_size_read(dentry->d_inode);
- REISERFS_I(inode)->i_flags |= i_has_xattr_dir;

/* Just return the size needed */
if (buffer == NULL) {
@@ -999,8 +994,6 @@ ssize_t reiserfs_listxattr(struct dentry
buf.r_pos = 0;
buf.r_inode = dentry->d_inode;

- REISERFS_I(dentry->d_inode)->i_flags |= i_has_xattr_dir;
-
mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_XATTR);
err = xattr_readdir(dir->d_inode, reiserfs_listxattr_filler, &buf);
mutex_unlock(&dir->d_inode->i_mutex);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/