From 1e0034a5937850a6feb4d4bd80edaedcca833dc2 Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Mon, 13 Feb 2006 11:12:36 -0500
Subject: [PATCH] --- yaml --- r: 20243 b: refs/heads/master c:
 90947ef26fa689a3252aa8282a01f60648e70fdb h: refs/heads/master i:   20241:
 312b9e495ab1210dd17b7819ca4174f730bc81af   20239:
 9bc026fdd28ce79535c92b527b30c9319b3cf494 v: v3

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

diff --git a/[refs] b/[refs]
index 2c2c92598c9c..ddd5e81c71a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 326a625748535c4cdb1c632b1dcb07030989a393
+refs/heads/master: 90947ef26fa689a3252aa8282a01f60648e70fdb
diff --git a/trunk/fs/reiserfs/xattr_acl.c b/trunk/fs/reiserfs/xattr_acl.c
index 43de3ba83332..ab8894c3b9e5 100644
--- a/trunk/fs/reiserfs/xattr_acl.c
+++ b/trunk/fs/reiserfs/xattr_acl.c
@@ -228,7 +228,8 @@ struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
 		acl = ERR_PTR(retval);
 	} else {
 		acl = posix_acl_from_disk(value, retval);
-		*p_acl = posix_acl_dup(acl);
+		if (!IS_ERR(acl))
+			*p_acl = posix_acl_dup(acl);
 	}
 
 	kfree(value);