diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-11-21 02:38:38 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-11-21 02:38:47 +0300 |
| commit | c55cf1296a0429d91b940a49a59977617a4e4cb3 (patch) | |
| tree | 11d7ae008a0ad5bfe4110966b6df7c44cff723fd /fs/hfsplus/posix_acl.c | |
| parent | 5509e6ee766f6b910c3b81c02bae291fc1d9a806 (diff) | |
| parent | 86429bd405de5741df4127096deae0b1d90b68f1 (diff) | |
| download | linux-dev-4.4.tar.xz | |
Merge tag 'v4.4.33' into dev-4.4openbmc-4.4-20161121-1dev-4.4
This is the 4.4.33 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'fs/hfsplus/posix_acl.c')
| -rw-r--r-- | fs/hfsplus/posix_acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hfsplus/posix_acl.c b/fs/hfsplus/posix_acl.c index df0c9af68d05..71b3087b7e32 100644 --- a/fs/hfsplus/posix_acl.c +++ b/fs/hfsplus/posix_acl.c @@ -68,8 +68,8 @@ int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl, case ACL_TYPE_ACCESS: xattr_name = POSIX_ACL_XATTR_ACCESS; if (acl) { - err = posix_acl_equiv_mode(acl, &inode->i_mode); - if (err < 0) + err = posix_acl_update_mode(inode, &inode->i_mode, &acl); + if (err) return err; } err = 0; |