diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 07:36:21 +0200 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 07:36:21 +0200 |
| commit | 134c428e5a31f2d5ed3a70ba20dac83895ec8b82 (patch) | |
| tree | 0fb28accbf09171b8a1ca792361f4160434529e8 /fs/btrfs/acl.c | |
| parent | powerpc: Add early debug for WSP platforms (diff) | |
| parent | powerpc/4xx: Fix regression in SMP on 476 (diff) | |
| download | linux-134c428e5a31f2d5ed3a70ba20dac83895ec8b82.tar.xz linux-134c428e5a31f2d5ed3a70ba20dac83895ec8b82.zip | |
Merge remote branch 'benh/merge' into benh-next
Diffstat (limited to 'fs/btrfs/acl.c')
| -rw-r--r-- | fs/btrfs/acl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 5d505aaa72fb..44ea5b92e1ba 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -178,12 +178,13 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name, if (value) { acl = posix_acl_from_xattr(value, size); + if (IS_ERR(acl)) + return PTR_ERR(acl); + if (acl) { ret = posix_acl_valid(acl); if (ret) goto out; - } else if (IS_ERR(acl)) { - return PTR_ERR(acl); } } |