diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2009-03-30 14:02:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 12:16:38 -0700 |
| commit | d984561b326cd0fe0d1183d11b9b4fa1d011d21d (patch) | |
| tree | e0487588581bccaa2b875529ed84ec5a4a254ab9 /fs/reiserfs/inode.c | |
| parent | 6c17675e1e02ebde220ef639a3fb1333928ec2f4 (diff) | |
| download | kernel_samsung_espresso10-d984561b326cd0fe0d1183d11b9b4fa1d011d21d.zip kernel_samsung_espresso10-d984561b326cd0fe0d1183d11b9b4fa1d011d21d.tar.gz kernel_samsung_espresso10-d984561b326cd0fe0d1183d11b9b4fa1d011d21d.tar.bz2 | |
reiserfs: eliminate per-super xattr lock
With the switch to using inode->i_mutex locking during lookups/creation
in the xattr root, the per-super xattr lock 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>
Diffstat (limited to 'fs/reiserfs/inode.c')
| -rw-r--r-- | fs/reiserfs/inode.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index cd42a86..50a73e7 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -1957,19 +1957,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, inode->i_nlink = 0; th->t_trans_id = 0; /* so the caller can't use this handle later */ unlock_new_inode(inode); /* OK to do even if we hadn't locked it */ - - /* If we were inheriting an ACL, we need to release the lock so that - * iput doesn't deadlock in reiserfs_delete_xattrs. The locking - * code really needs to be reworked, but this will take care of it - * for now. -jeffm */ -#ifdef CONFIG_REISERFS_FS_POSIX_ACL - if (REISERFS_I(dir)->i_acl_default && !IS_ERR(REISERFS_I(dir)->i_acl_default)) { - reiserfs_write_unlock_xattrs(dir->i_sb); - iput(inode); - reiserfs_write_lock_xattrs(dir->i_sb); - } else -#endif - iput(inode); + iput(inode); return err; } |