diff options
Diffstat (limited to 'fs/nfsd/nfs2acl.c')
-rw-r--r-- | fs/nfsd/nfs2acl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index 12b023a7ab7d..ac54ea60b3f6 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c | |||
@@ -54,14 +54,14 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, | |||
54 | 54 | ||
55 | if (resp->mask & (NFS_ACL|NFS_ACLCNT)) { | 55 | if (resp->mask & (NFS_ACL|NFS_ACLCNT)) { |
56 | acl = get_acl(inode, ACL_TYPE_ACCESS); | 56 | acl = get_acl(inode, ACL_TYPE_ACCESS); |
57 | if (IS_ERR(acl)) { | ||
58 | nfserr = nfserrno(PTR_ERR(acl)); | ||
59 | goto fail; | ||
60 | } | ||
61 | if (acl == NULL) { | 57 | if (acl == NULL) { |
62 | /* Solaris returns the inode's minimum ACL. */ | 58 | /* Solaris returns the inode's minimum ACL. */ |
63 | acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL); | 59 | acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL); |
64 | } | 60 | } |
61 | if (IS_ERR(acl)) { | ||
62 | nfserr = nfserrno(PTR_ERR(acl)); | ||
63 | goto fail; | ||
64 | } | ||
65 | resp->acl_access = acl; | 65 | resp->acl_access = acl; |
66 | } | 66 | } |
67 | if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) { | 67 | if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) { |