diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:06:08 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:06:08 -0400 |
| commit | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch) | |
| tree | 406a3c127abb008f2f736c8d2ee03fc3c2926d6b /fs/jfs | |
| parent | f334bcd94b7d3c0fbc34d518a86548f451ab5faf (diff) | |
| parent | 030b533c4fd4d2ec3402363323de4bb2983c9cee (diff) | |
| download | linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.gz | |
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'fs/jfs')
| -rw-r--r-- | fs/jfs/acl.c | 6 | ||||
| -rw-r--r-- | fs/jfs/file.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c index 21fa92ba2c19..3a1e1554a4e3 100644 --- a/fs/jfs/acl.c +++ b/fs/jfs/acl.c @@ -78,13 +78,11 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type, case ACL_TYPE_ACCESS: ea_name = XATTR_NAME_POSIX_ACL_ACCESS; if (acl) { - rc = posix_acl_equiv_mode(acl, &inode->i_mode); - if (rc < 0) + rc = posix_acl_update_mode(inode, &inode->i_mode, &acl); + if (rc) return rc; inode->i_ctime = CURRENT_TIME; mark_inode_dirty(inode); - if (rc == 0) - acl = NULL; } break; case ACL_TYPE_DEFAULT: diff --git a/fs/jfs/file.c b/fs/jfs/file.c index 7f1a585a0a94..cf62037b8a04 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c @@ -103,7 +103,7 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr) struct inode *inode = d_inode(dentry); int rc; - rc = inode_change_ok(inode, iattr); + rc = setattr_prepare(dentry, iattr); if (rc) return rc; |