diff --git a/[refs] b/[refs]
index d03925fe369c..b0dd394d0227 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 009ca3897ea8313b4ed4da964a2f31ecf5a0624d
+refs/heads/master: 6f81c1157468dd0a7377249c44ae83a7fe998bc9
diff --git a/trunk/fs/9p/acl.c b/trunk/fs/9p/acl.c
index c9da2640f6f1..02a2cf616318 100644
--- a/trunk/fs/9p/acl.c
+++ b/trunk/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;