diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-11-01 12:01:20 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-11-01 12:01:20 +0800 |
commit | 79df8fa79b6a2aced892ad2b2c9832e7d9bdea6b (patch) | |
tree | 725b3b29e466e846837cf56cec1bafd99fe5ca71 /fs/f2fs | |
parent | c11a255c622e7a2d312f4080c6ef529dd67b3c38 (diff) | |
parent | 1714a3e139090705a0bd862a8b7bba930181cfbd (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'fs/f2fs')
-rw-r--r-- | fs/f2fs/acl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c index c8f25f7241f0..e9a8d676c6bc 100644 --- a/fs/f2fs/acl.c +++ b/fs/f2fs/acl.c @@ -214,12 +214,10 @@ static int __f2fs_set_acl(struct inode *inode, int type, case ACL_TYPE_ACCESS: name_index = F2FS_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; set_acl_inode(fi, inode->i_mode); - if (error == 0) - acl = NULL; } break; |