The patch titled
reiserfs+acl+quota deadlock fix
has been added to the -mm tree. Its filename is
reiserfsaclquota-deadlock-fix.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
reiserfsaclquota-deadlock-fix.patch
fs-kconfig-quota-help-text-updates.patch
fix-jbd-race-in-t_forget-list-handling.patch
make-ll_rw_block-wait-for-buffer-lock.patch
change-ll_rw_block-calls-in-jbd.patch
change-ll_rw_block-calls-in-reiser.patch
change-ll_rw_block-calls-in-ufs.patch
change-hfs-to-not-use-ll_rw_block.patch
fix-race-in-do_get_write_access.patch
jbd-split-checkpoint-lists.patch
From: Jan Kara <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
Cc: Jeff Mahoney <[EMAIL PROTECTED]>
Cc: Chris Mason <[EMAIL PROTECTED]>
Cc: <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
fs/reiserfs/inode.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN fs/reiserfs/inode.c~reiserfsaclquota-deadlock-fix fs/reiserfs/inode.c
--- 25/fs/reiserfs/inode.c~reiserfsaclquota-deadlock-fix Wed Aug 17
15:33:21 2005
+++ 25-akpm/fs/reiserfs/inode.c Wed Aug 17 15:33:21 2005
@@ -1989,7 +1989,7 @@ int reiserfs_new_inode(struct reiserfs_t
* 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);
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
