diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-12-03 03:52:43 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-12-03 03:52:43 +0000 |
| commit | ebb27386ffd2fcd0fad141e0eee97b8070f94ee2 (patch) | |
| tree | 3c71ee87e8771ac0eed912729605dbaf3f39348c /fs | |
| parent | 6d20e8406f0942228a73000663c2b33f488103ea (diff) | |
| parent | 59e57c622c3502346e8f930421ebc482d639520c (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/reiserfs/xattr_acl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 536d697a8a2..90d2fcb67a3 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c @@ -472,7 +472,9 @@ int reiserfs_acl_chmod(struct inode *inode) struct reiserfs_transaction_handle th; size_t size = reiserfs_xattr_nblocks(inode, reiserfs_acl_size(clone->a_count)); - reiserfs_write_lock(inode->i_sb); + int depth; + + depth = reiserfs_write_lock_once(inode->i_sb); error = journal_begin(&th, inode->i_sb, size * 2); if (!error) { int error2; @@ -482,7 +484,7 @@ int reiserfs_acl_chmod(struct inode *inode) if (error2) error = error2; } - reiserfs_write_unlock(inode->i_sb); + reiserfs_write_unlock_once(inode->i_sb, depth); } posix_acl_release(clone); return error; |