diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-11-03 03:27:58 +0100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-11-03 03:27:58 +0100 |
| commit | 2da5c4b05ab55225f5d1fcc8c1c37d1918232bf4 (patch) | |
| tree | f19bd87d6e66c251566be226fdf40c24c168e04a /fs/xfs/xfs_ioctl.c | |
| parent | Merge branch 'xfs-stats-fixes' into for-next (diff) | |
| parent | xfs: optimise away log forces on timestamp updates for fdatasync (diff) | |
| download | linux-2da5c4b05ab55225f5d1fcc8c1c37d1918232bf4.tar.xz linux-2da5c4b05ab55225f5d1fcc8c1c37d1918232bf4.zip | |
Merge branch 'xfs-misc-fixes-for-4.4-2' into for-next
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index c88ddcadd656..d42738deec6d 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -40,6 +40,7 @@ #include "xfs_symlink.h" #include "xfs_trans.h" #include "xfs_pnfs.h" +#include "xfs_acl.h" #include <linux/capability.h> #include <linux/dcache.h> @@ -482,6 +483,7 @@ xfs_attrmulti_attr_set( __uint32_t flags) { unsigned char *kbuf; + int error; if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; @@ -492,7 +494,11 @@ xfs_attrmulti_attr_set( if (IS_ERR(kbuf)) return PTR_ERR(kbuf); - return xfs_attr_set(XFS_I(inode), name, kbuf, len, flags); + error = xfs_attr_set(XFS_I(inode), name, kbuf, len, flags); + if (!error) + xfs_forget_acl(inode, name, flags); + kfree(kbuf); + return error; } int @@ -501,9 +507,14 @@ xfs_attrmulti_attr_remove( unsigned char *name, __uint32_t flags) { + int error; + if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; - return xfs_attr_remove(XFS_I(inode), name, flags); + error = xfs_attr_remove(XFS_I(inode), name, flags); + if (!error) + xfs_forget_acl(inode, name, flags); + return error; } STATIC int |