diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2014-07-09 21:54:16 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-07-11 15:03:53 -0400 |
| commit | 35e634b83cbe23e5673289d1536752968aab8f75 (patch) | |
| tree | 77660dfe5a38520090ac78c8a1f1a967dd42771c /fs/nfsd/nfs2acl.c | |
| parent | 255942907e7ff498ab1545b5edce5690833ff640 (diff) | |
| download | linux-35e634b83cbe23e5673289d1536752968aab8f75.tar.gz linux-35e634b83cbe23e5673289d1536752968aab8f75.tar.bz2 linux-35e634b83cbe23e5673289d1536752968aab8f75.zip | |
NFSD: Check acl returned from get_acl/posix_acl_from_mode
Commit 4ac7249ea5 (nfsd: use get_acl and ->set_acl)
don't check the acl returned from get_acl()/posix_acl_from_mode().
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
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, if (resp->mask & (NFS_ACL|NFS_ACLCNT)) { acl = get_acl(inode, ACL_TYPE_ACCESS); - if (IS_ERR(acl)) { - nfserr = nfserrno(PTR_ERR(acl)); - goto fail; - } if (acl == NULL) { /* Solaris returns the inode's minimum ACL. */ acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL); } + if (IS_ERR(acl)) { + nfserr = nfserrno(PTR_ERR(acl)); + goto fail; + } resp->acl_access = acl; } if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) { |