From: Jeff Mahoney reiserfs_new_inode() can call iput() with the xattr lock held. This will cause a deadlock to occur when reiserfs_delete_xattrs() is called to clean up. The following patch releases the lock and reacquires it after the iput. This is safe because interaction with xattrs is complete, and the relock is just to balance out the release in the caller. The locking needs some reworking to be more sane, but that's more intrusive and I was just looking to fix this bug. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton --- fs/reiserfs/inode.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) diff -puN fs/reiserfs/inode.c~reiserfs-fix-deadlock-in-inode-creation-failure-path-w-default-acl fs/reiserfs/inode.c --- devel/fs/reiserfs/inode.c~reiserfs-fix-deadlock-in-inode-creation-failure-path-w-default-acl 2005-07-26 00:37:35.000000000 -0700 +++ devel-akpm/fs/reiserfs/inode.c 2005-07-26 00:37:35.000000000 -0700 @@ -1980,7 +1980,17 @@ int reiserfs_new_inode(struct reiserfs_t out_inserted_sd: inode->i_nlink = 0; th->t_trans_id = 0; /* so the caller can't use this handle later */ - iput(inode); + + /* 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 */ + if (REISERFS_I(dir)->i_acl_default) { + reiserfs_write_unlock_xattrs(dir->i_sb); + iput(inode); + reiserfs_write_lock_xattrs(dir->i_sb); + } else + iput(inode); return err; } _