diff options
| author | Al Viro | 2016-10-08 17:06:08 +0200 |
|---|---|---|
| committer | Al Viro | 2016-10-08 17:06:08 +0200 |
| commit | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch) | |
| tree | 406a3c127abb008f2f736c8d2ee03fc3c2926d6b /fs/ext2/acl.c | |
| parent | Merge remote-tracking branch 'ovl/misc' into work.misc (diff) | |
| parent | fs: Avoid premature clearing of capabilities (diff) | |
| download | kernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.gz kernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.xz kernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.zip | |
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'fs/ext2/acl.c')
| -rw-r--r-- | fs/ext2/acl.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 42f1d1814083..e725aa0890e0 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c @@ -190,15 +190,11 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type) case ACL_TYPE_ACCESS: name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS; if (acl) { - error = posix_acl_equiv_mode(acl, &inode->i_mode); - if (error < 0) + error = posix_acl_update_mode(inode, &inode->i_mode, &acl); + if (error) return error; - else { - inode->i_ctime = CURRENT_TIME_SEC; - mark_inode_dirty(inode); - if (error == 0) - acl = NULL; - } + inode->i_ctime = CURRENT_TIME_SEC; + mark_inode_dirty(inode); } break; |