fs/9p: Fix the return error on default acl removal
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Fri, 10 Dec 2010 06:49:31 +0000 (12:19 +0530)
committerEric Van Hensbergen <ericvh@gmail.com>
Tue, 11 Jan 2011 15:58:07 +0000 (09:58 -0600)
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>
fs/9p/acl.c

index c9da2640f6f148a9655b629d614316631b7448a1..02a2cf61631836d4f810d22a0626e72a79b8d0ab 100644 (file)
@@ -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;