diff options
| author | Sergio Gelato <Sergio.Gelato@astro.su.se> | 2014-11-06 14:05:30 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-13 19:01:52 +0100 |
| commit | ba1816b40a87a3f3c4ca9cd54a593a10d87bd391 (patch) | |
| tree | 464f69fd988473762739dc886c369431046c0b6f | |
| parent | 0e8361ae716b89ea54a97050fbf9d74f6dc4292d (diff) | |
| download | lwn-ba1816b40a87a3f3c4ca9cd54a593a10d87bd391.tar.gz lwn-ba1816b40a87a3f3c4ca9cd54a593a10d87bd391.zip | |
nfsd: fix NFS regression
Fix regression introduced in pre-3.14 kernels by cherry-picking
aa07c713ecfc0522916f3cd57ac628ea6127c0ec (NFSD: Call ->set_acl with a
NULL ACL structure if no entries). This is in v3.12.22 as commit
723ac81c8671b3a095d9eb303974c7bc9964b506.
The affected code was removed in 3.14 by commit
4ac7249ea5a0ceef9f8269f63f33cc873c3fac61 (nfsd: use get_acl
and ->set_acl). The ->set_acl methods are already able to cope with a
NULL argument. So this is not needed for >= 3.14.
Signed-off-by: Sergio Gelato <Sergio.Gelato@astro.su.se>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/nfsd/vfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index e9a80e4553a3..fafac65804d6 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -509,6 +509,9 @@ set_nfsv4_acl_one(struct dentry *dentry, struct posix_acl *pacl, char *key) char *buf = NULL; int error = 0; + if (!pacl) + return vfs_setxattr(dentry, key, NULL, 0, 0); + buflen = posix_acl_xattr_size(pacl->a_count); buf = kmalloc(buflen, GFP_KERNEL); error = -ENOMEM; |