diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-15 10:22:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-15 10:22:10 -0700 |
| commit | eed631e0d741d1a1067cfc6d709fdf2363126f9c (patch) | |
| tree | 31ba02472a8d5ef2d7780274a7663258c09a9acf /fs/btrfs/acl.c | |
| parent | bd1a643e10eb8782b36b47c3602300319dd2fb00 (diff) | |
| parent | ebcb904dfe31644857422e3bb62e50f76fe86255 (diff) | |
| download | op-kernel-dev-eed631e0d741d1a1067cfc6d709fdf2363126f9c.zip op-kernel-dev-eed631e0d741d1a1067cfc6d709fdf2363126f9c.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: fix FS_IOC_SETFLAGS ioctl
Btrfs: fix FS_IOC_GETFLAGS ioctl
fs: remove FS_COW_FL
Btrfs: fix easily get into ENOSPC in mixed case
Prevent oopsing in posix_acl_valid()
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 5d505aa..44ea5b9 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); } } |
