diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 11:38:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 11:38:04 -0500 |
| commit | bf3d846b783327359ddc4bd4f52627b36abb4d1d (patch) | |
| tree | c6b8fddbf04a2962dfcf9f487af25033f11b10b9 /fs/9p | |
| parent | 54c0a4b46150db1571d955d598cd342c9f1d9657 (diff) | |
| parent | f6500801522c61782d4990fa1ad96154cb397cd4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro:
"Assorted stuff; the biggest pile here is Christoph's ACL series. Plus
assorted cleanups and fixes all over the place...
There will be another pile later this week"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (43 commits)
__dentry_path() fixes
vfs: Remove second variable named error in __dentry_path
vfs: Is mounted should be testing mnt_ns for NULL or error.
Fix race when checking i_size on direct i/o read
hfsplus: remove can_set_xattr
nfsd: use get_acl and ->set_acl
fs: remove generic_acl
nfs: use generic posix ACL infrastructure for v3 Posix ACLs
gfs2: use generic posix ACL infrastructure
jfs: use generic posix ACL infrastructure
xfs: use generic posix ACL infrastructure
reiserfs: use generic posix ACL infrastructure
ocfs2: use generic posix ACL infrastructure
jffs2: use generic posix ACL infrastructure
hfsplus: use generic posix ACL infrastructure
f2fs: use generic posix ACL infrastructure
ext2/3/4: use generic posix ACL infrastructure
btrfs: use generic posix ACL infrastructure
fs: make posix_acl_create more useful
fs: make posix_acl_chmod more useful
...
Diffstat (limited to 'fs/9p')
| -rw-r--r-- | fs/9p/acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c index 7af425f53bee..8482f2d11606 100644 --- a/fs/9p/acl.c +++ b/fs/9p/acl.c | |||
| @@ -156,7 +156,7 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid) | |||
| 156 | return -EOPNOTSUPP; | 156 | return -EOPNOTSUPP; |
| 157 | acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS); | 157 | acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS); |
| 158 | if (acl) { | 158 | if (acl) { |
| 159 | retval = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode); | 159 | retval = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode); |
| 160 | if (retval) | 160 | if (retval) |
| 161 | return retval; | 161 | return retval; |
| 162 | set_cached_acl(inode, ACL_TYPE_ACCESS, acl); | 162 | set_cached_acl(inode, ACL_TYPE_ACCESS, acl); |
| @@ -200,7 +200,7 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep, | |||
| 200 | if (acl) { | 200 | if (acl) { |
| 201 | if (S_ISDIR(mode)) | 201 | if (S_ISDIR(mode)) |
| 202 | *dpacl = posix_acl_dup(acl); | 202 | *dpacl = posix_acl_dup(acl); |
| 203 | retval = posix_acl_create(&acl, GFP_NOFS, &mode); | 203 | retval = __posix_acl_create(&acl, GFP_NOFS, &mode); |
| 204 | if (retval < 0) | 204 | if (retval < 0) |
| 205 | return retval; | 205 | return retval; |
| 206 | if (retval > 0) | 206 | if (retval > 0) |