From b2363cbedaa8ef331b4dcd47fb7b58a561c1a4c1 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Thu, 18 Aug 2005 11:24:17 -0700
Subject: [PATCH] --- yaml --- r: 5871 b: refs/heads/master c:
 d86c390ffbf5746df9a3cc2c5f7b75d27704580f h: refs/heads/master i:   5869:
 362499888cdbcf1fcde8ca951609b3f868db6755   5867:
 d2b3b33e39e7f7a0a12ef025e01b8dbfbcb011ff   5863:
 bbfb73c1246f626af396f0a0b79554211d37711d   5855:
 2dfe88ad4ab6c9204829981035cfab5ee10b0622 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7103240e0d52..c0179eece21c 100644
--- 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
index d9f614a57731..ff291c973a56 100644
--- 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);