From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Date: Fri, 10 Dec 2010 06:49:31 +0000 (+0530)
Subject: fs/9p: Fix the return error on default acl removal
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f81c1157468dd0a7377249c44ae83a7fe998bc9;p=linux.git

fs/9p: Fix the return error on default acl removal

If we don't have default ACL, then trying to remove
default acl on a file should return 0.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
---

diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index c9da2640f6f14..02a2cf6163183 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -365,7 +365,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
 	case ACL_TYPE_DEFAULT:
 		name = POSIX_ACL_XATTR_DEFAULT;
 		if (!S_ISDIR(inode->i_mode)) {
-			retval = -EINVAL;
+			retval = acl ? -EINVAL : 0;
 			goto err_out;
 		}
 		break;