diff options
Diffstat (limited to 'fs/9p/acl.c')
-rw-r--r-- | fs/9p/acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c index 6e58c4ca1e6e..02a2cf616318 100644 --- a/fs/9p/acl.c +++ b/fs/9p/acl.c | |||
@@ -28,7 +28,7 @@ static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, char *name) | |||
28 | { | 28 | { |
29 | ssize_t size; | 29 | ssize_t size; |
30 | void *value = NULL; | 30 | void *value = NULL; |
31 | struct posix_acl *acl = NULL;; | 31 | struct posix_acl *acl = NULL; |
32 | 32 | ||
33 | size = v9fs_fid_xattr_get(fid, name, NULL, 0); | 33 | size = v9fs_fid_xattr_get(fid, name, NULL, 0); |
34 | if (size > 0) { | 34 | if (size > 0) { |
@@ -365,7 +365,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name, | |||
365 | case ACL_TYPE_DEFAULT: | 365 | case ACL_TYPE_DEFAULT: |
366 | name = POSIX_ACL_XATTR_DEFAULT; | 366 | name = POSIX_ACL_XATTR_DEFAULT; |
367 | if (!S_ISDIR(inode->i_mode)) { | 367 | if (!S_ISDIR(inode->i_mode)) { |
368 | retval = -EINVAL; | 368 | retval = acl ? -EINVAL : 0; |
369 | goto err_out; | 369 | goto err_out; |
370 | } | 370 | } |
371 | break; | 371 | break; |