UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jeff Mahoney 2009-03-30 14:02:37 -04:00 committed by Linus Torvalds
parent 8b6dd72a44
commit 8ecbe550a1
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/reiserfs/xattr.c
View File

@ -459,10 +459,7 @@ int reiserfs_delete_xattrs(struct inode *inode)
dput(root); dput(root);
out: out:
if (!err) if (err)
REISERFS_I(inode)->i_flags =
REISERFS_I(inode)->i_flags & ~i_has_xattr_dir;
else
reiserfs_warning(inode->i_sb, "jdm-20004", reiserfs_warning(inode->i_sb, "jdm-20004",
"Couldn't remove all xattrs (%d)\n", err); "Couldn't remove all xattrs (%d)\n", err);
return err; return err;
@ -660,7 +657,6 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer,
down_write(&REISERFS_I(inode)->i_xattr_sem); down_write(&REISERFS_I(inode)->i_xattr_sem);
xahash = xattr_hash(buffer, buffer_size); xahash = xattr_hash(buffer, buffer_size);
REISERFS_I(inode)->i_flags |= i_has_xattr_dir;
/* Resize it so we're ok to write there */ /* Resize it so we're ok to write there */
newattrs.ia_size = buffer_size; newattrs.ia_size = buffer_size;
@ -769,7 +765,6 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer,
down_read(&REISERFS_I(inode)->i_xattr_sem); down_read(&REISERFS_I(inode)->i_xattr_sem);
isize = i_size_read(dentry->d_inode); isize = i_size_read(dentry->d_inode);
REISERFS_I(inode)->i_flags |= i_has_xattr_dir;
/* Just return the size needed */ /* Just return the size needed */
if (buffer == NULL) { if (buffer == NULL) {
@ -999,8 +994,6 @@ ssize_t reiserfs_listxattr(struct dentry * dentry, char *buffer, size_t size)
buf.r_pos = 0; buf.r_pos = 0;
buf.r_inode = dentry->d_inode; 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); mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_XATTR);
err = xattr_readdir(dir->d_inode, reiserfs_listxattr_filler, &buf); err = xattr_readdir(dir->d_inode, reiserfs_listxattr_filler, &buf);
mutex_unlock(&dir->d_inode->i_mutex); mutex_unlock(&dir->d_inode->i_mutex);