From a635ba1b58c139053599100a6bc8c80a45bebe2e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 8 Jun 2009 20:46:54 -0400 Subject: [PATCH] --- yaml --- r: 154134 b: refs/heads/master c: e68888bcb60ccba4dc21df9f2d8cd7325b64dce7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/reiserfs/xattr_acl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4489666d9fb0..a02b4653d829 100644 --- 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 index c303c426fe2b..a1a7e3530e17 100644 --- 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); }