diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 17:06:08 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 17:06:08 +0200 |
| commit | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch) | |
| tree | 406a3c127abb008f2f736c8d2ee03fc3c2926d6b /fs/gfs2 | |
| parent | Merge remote-tracking branch 'ovl/misc' into work.misc (diff) | |
| parent | fs: Avoid premature clearing of capabilities (diff) | |
| download | linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.xz linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.zip | |
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/acl.c | 12 | ||||
| -rw-r--r-- | fs/gfs2/inode.c | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c index 363ba9e9d8d0..2524807ee070 100644 --- a/fs/gfs2/acl.c +++ b/fs/gfs2/acl.c @@ -92,17 +92,11 @@ int __gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type) if (type == ACL_TYPE_ACCESS) { umode_t mode = inode->i_mode; - error = posix_acl_equiv_mode(acl, &mode); - if (error < 0) + error = posix_acl_update_mode(inode, &inode->i_mode, &acl); + if (error) return error; - - if (error == 0) - acl = NULL; - - if (mode != inode->i_mode) { - inode->i_mode = mode; + if (mode != inode->i_mode) mark_inode_dirty(inode); - } } if (acl) { diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index e4da0ecd3285..d693af5ca5bc 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -1932,7 +1932,7 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr) if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) goto out; - error = inode_change_ok(inode, attr); + error = setattr_prepare(dentry, attr); if (error) goto out; |