diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-14 17:13:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-14 17:13:28 -0800 |
| commit | f4d3935e4f4884ba80561db5549394afb8eef8f7 (patch) | |
| tree | c9bfd0dc1ffdfbcb7f34870eea4848240775e086 /fs/posix_acl.c | |
| parent | 34241af77b8696120a9735bb2579ec7044199a8b (diff) | |
| parent | b9dc6f65bc5e232d1c05fe34b5daadc7e8bbf1fb (diff) | |
| download | op-kernel-dev-f4d3935e4f4884ba80561db5549394afb8eef8f7.zip op-kernel-dev-f4d3935e4f4884ba80561db5549394afb8eef8f7.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro.
The most notable fix here is probably the fix for a splice regression
("fix a fencepost error in pipe_advance()") noticed by Alan Wylie.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fix a fencepost error in pipe_advance()
coredump: Ensure proper size of sparse core files
aio: fix lock dep warning
tmpfs: clear S_ISGID when setting posix ACLs
Diffstat (limited to 'fs/posix_acl.c')
| -rw-r--r-- | fs/posix_acl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 5955220..c9d48dc 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -922,11 +922,10 @@ int simple_set_acl(struct inode *inode, struct posix_acl *acl, int type) int error; if (type == ACL_TYPE_ACCESS) { - error = posix_acl_equiv_mode(acl, &inode->i_mode); - if (error < 0) - return 0; - if (error == 0) - acl = NULL; + error = posix_acl_update_mode(inode, + &inode->i_mode, &acl); + if (error) + return error; } inode->i_ctime = current_time(inode); |
