---

yaml --- r: 5871 b: refs/heads/master c: d86c390 h: refs/heads/master i: 5869: 3624998 5867: d2b3b33 5863: bbfb73c 5855: 2dfe88a v: v3
git-mirror · Aug 18, 2005 · b2363cb · b2363cb
1 parent 722850a
commit b2363cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9223214e8d757663f366133ba5f9b58aa6b28efb
+refs/heads/master: d86c390ffbf5746df9a3cc2c5f7b75d27704580f
diff --git a/trunk/fs/reiserfs/inode.c b/trunk/fs/reiserfs/inode.c
@@ -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);