summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2010-12-10 12:19:31 +0530
committerEric Van Hensbergen <ericvh@gmail.com>2011-01-11 09:58:07 -0600
commit6f81c1157468dd0a7377249c44ae83a7fe998bc9 (patch)
tree3d7bcef08c3789b7db9704b4e31da75b0599803c /fs
parent009ca3897ea8313b4ed4da964a2f31ecf5a0624d (diff)
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/9p/acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index c9da2640f6f1..02a2cf616318 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;