[PATCH] reiserfs+acl+quota deadlock fix
When i_acl_default is set to some error we do not hold the lock (hence we are not allowed to drop it and reacquire later). Signed-off-by: Jan Kara <jack@suse.cz> Cc: Jeff Mahoney <jeffm@suse.com> Cc: Chris Mason <mason@suse.com> Cc: <reiserfs-dev@namesys.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
9223214e8d
commit
d86c390ffb
|
@ -1985,7 +1985,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
|
|||
* 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 */
|
||||
if (REISERFS_I(dir)->i_acl_default) {
|
||||
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);
|
||||
|
|
Loading…
Reference in New Issue