[PATCH Lucid SRU] UBUNTU: SAUCE: Fix nfs oops stable regression

[rtg.canonical at gmail.com]

From: Tim Gardner <tim.gardner at canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1348670

Fix regression introduced in 3.2.60 by cherry-picking a post-3.14 patch that
depends on the set_acl methods being able to cope with a NULL ACL argument.

Signed-off-by: Sergio Gelato <Sergio.Gelato at astro.su.se>
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 fs/nfsd/vfs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 446dc01..fc208e4 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -450,6 +450,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;
-- 
1.9.1