nfsd: Remove assignments inside conditions
Assignments should not happen inside an if conditional, but in the line before. This issue was reported by checkpatch. The semantic patch that makes this change is as follows (http://coccinelle.lip6.fr/): // <smpl> @@ identifier i1; expression e1; statement S; @@ -if(!(i1 = e1)) S +i1 = e1; +if(!i1) +S // </smpl> It has been tested by compilation. Signed-off-by: Benoit Taine <benoit.taine@lip6.fr> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:

committed by
J. Bruce Fields

parent
f35ea0d4b6
commit
d40aa3372f
@@ -128,7 +128,8 @@ out:
|
||||
static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p,
|
||||
struct nfsd3_getaclargs *args)
|
||||
{
|
||||
if (!(p = nfs3svc_decode_fh(p, &args->fh)))
|
||||
p = nfs3svc_decode_fh(p, &args->fh);
|
||||
if (!p)
|
||||
return 0;
|
||||
args->mask = ntohl(*p); p++;
|
||||
|
||||
@@ -143,7 +144,8 @@ static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p,
|
||||
unsigned int base;
|
||||
int n;
|
||||
|
||||
if (!(p = nfs3svc_decode_fh(p, &args->fh)))
|
||||
p = nfs3svc_decode_fh(p, &args->fh);
|
||||
if (!p)
|
||||
return 0;
|
||||
args->mask = ntohl(*p++);
|
||||
if (args->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT) ||
|
||||
|
Reference in New Issue
Block a user