X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Freiserfs%2Finode.c;h=ff291c973a567f4d9226c3840c98ea002c4ed823;hb=8aaf226a8eaa0823c4f3c58d5207004ff6e3e758;hp=d9f614a57731bd08bad340ab08b0662dc99cfd58;hpb=96fad28a781069eb40156f78b8f50c349805b652;p=linux-2.6

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index d9f614a577..ff291c973a 100644
--- a/fs/reiserfs/inode.c
+++ b/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);