---

yaml --- r: 154134 b: refs/heads/master c: e68888b h: refs/heads/master v: v3
git-mirror · Jun 24, 2009 · a635ba1 · a635ba1
1 parent 7766c00
commit a635ba1
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: d441b1c293149212045de00f346c8ea6cd41cce4
+refs/heads/master: e68888bcb60ccba4dc21df9f2d8cd7325b64dce7
diff --git a/trunk/fs/reiserfs/xattr_acl.c b/trunk/fs/reiserfs/xattr_acl.c
@@ -194,7 +194,7 @@ static inline void iset_acl(struct inode *inode, struct posix_acl **i_acl,
 	spin_lock(&inode->i_lock);
 	if (*i_acl != ERR_PTR(-ENODATA))
 		posix_acl_release(*i_acl);
-	*i_acl = posix_acl_dup(acl);
+	*i_acl = acl ? posix_acl_dup(acl) : ERR_PTR(-ENODATA);
 	spin_unlock(&inode->i_lock);
 }