diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 14:03:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 14:03:55 -0800 |
| commit | 82062e7b50280bcf0feca70ac35a44f375602976 (patch) | |
| tree | 0321bff42945768990a92c3770d4270497c0e8ee /fs/reiserfs/xattr_acl.c | |
| parent | dbd6a7cfead4fa2d7ad3fefe47168fcb146ac5ba (diff) | |
| parent | 31370f62baa1460b785cee9944bdcaf63d19e567 (diff) | |
| download | lwn-82062e7b50280bcf0feca70ac35a44f375602976.tar.gz lwn-82062e7b50280bcf0feca70ac35a44f375602976.zip | |
Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
reiserfs: Relax reiserfs_xattr_set_handle() while acquiring xattr locks
reiserfs: Fix unreachable statement
reiserfs: Don't call reiserfs_get_acl() with the reiserfs lock
reiserfs: Relax lock on xattr removing
reiserfs: Relax the lock before truncating pages
reiserfs: Fix recursive lock on lchown
reiserfs: Fix mistake in down_write() conversion
Diffstat (limited to 'fs/reiserfs/xattr_acl.c')
| -rw-r--r-- | fs/reiserfs/xattr_acl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index cc32e6ada67b..dd20a7883f0f 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c @@ -455,7 +455,9 @@ int reiserfs_acl_chmod(struct inode *inode) return 0; } + reiserfs_write_unlock(inode->i_sb); acl = reiserfs_get_acl(inode, ACL_TYPE_ACCESS); + reiserfs_write_lock(inode->i_sb); if (!acl) return 0; if (IS_ERR(acl)) |