---

yaml --- r: 20243 b: refs/heads/master c: 90947ef h: refs/heads/master i: 20241: 312b9e4 20239: 9bc026f v: v3
git-mirror · Feb 13, 2006 · 1e0034a · 1e0034a
1 parent fa8a071
commit 1e0034a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);