diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-24 22:33:22 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-24 22:33:22 +0100 |
| commit | 9667ac21619a16bb0c280372fd4bb14be08d07f6 (patch) | |
| tree | 870a1e4c31a363cae23e72314ca9120a5916bd69 /fs/ext2 | |
| parent | c1177831f5a1fd3ee9e5c3f9567526a5d62d5d78 (diff) | |
| parent | a4418c438de6ad397fd17f006ca86257fb9ec5a6 (diff) | |
Merge remote-tracking branch 'fslc/4.1-2.0.x-imx' into toradex_4.1-2.0.x-imx
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/acl.c | 12 | ||||
| -rw-r--r-- | fs/ext2/inode.c | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 27695e6f4e46..d6aeb84e90b6 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c @@ -193,15 +193,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; diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index f460ae36d5b7..f08604366cb5 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -1547,7 +1547,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr) struct inode *inode = d_inode(dentry); int error; - error = inode_change_ok(inode, iattr); + error = setattr_prepare(dentry, iattr); if (error) return error; |