diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-01-05 02:14:30 +0100 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-01-05 08:00:50 +0100 |
| commit | 4f3be1b5a98587b86cae05aa5d129dd0b3fff466 (patch) | |
| tree | f4d9acd840357ccdd6d5e667132996c050d0a9fa | |
| parent | 108d3943c021f0b66e860ba98ded40b82b677bd7 (diff) | |
| download | kernel_samsung_smdk4412-4f3be1b5a98587b86cae05aa5d129dd0b3fff466.zip kernel_samsung_smdk4412-4f3be1b5a98587b86cae05aa5d129dd0b3fff466.tar.gz kernel_samsung_smdk4412-4f3be1b5a98587b86cae05aa5d129dd0b3fff466.tar.bz2 | |
reiserfs: Relax lock on xattr removing
When we remove an xattr, we call lookup_and_delete_xattr()
that takes some private xattr inodes mutexes. But we hold
the reiserfs lock at this time, which leads to dependency
inversions.
We can safely call lookup_and_delete_xattr() without the
reiserfs lock, where xattr inodes lookups only need the
xattr inodes mutexes.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Christian Kujau <lists@nerdbynature.de>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | fs/reiserfs/xattr.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 75d3706..4899d78 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -451,7 +451,9 @@ static int lookup_and_delete_xattr(struct inode *inode, const char *name) } if (dentry->d_inode) { + reiserfs_write_lock(inode->i_sb); err = xattr_unlink(xadir->d_inode, dentry); + reiserfs_write_unlock(inode->i_sb); update_ctime(inode); } @@ -485,10 +487,14 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th, if (get_inode_sd_version(inode) == STAT_DATA_V1) return -EOPNOTSUPP; - if (!buffer) - return lookup_and_delete_xattr(inode, name); - reiserfs_write_unlock(inode->i_sb); + + if (!buffer) { + err = lookup_and_delete_xattr(inode, name); + reiserfs_write_lock(inode->i_sb); + return err; + } + dentry = xattr_lookup(inode, name, flags); if (IS_ERR(dentry)) { reiserfs_write_lock(inode->i_sb); |