Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f419992c authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: add __force to opaque verifier field casts 



sparse complains that we're stuffing non-byte-swapped values into
__be32's here. Since they're supposed to be opaque, it doesn't matter
much. Just add __force to make sparse happy.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent bf18f163

fs/nfsd/nfs4proc.c

+6 −2
Original line number Diff line number Diff line
@@ -581,8 +581,12 @@ static void gen_boot_verifier(nfs4_verifier *verifier, struct net *net) 
	__be32 verf[2];

	struct nfsd_net *nn = net_generic(net, nfsd_net_id);



	verf[0] = (__be32)nn->nfssvc_boot.tv_sec;

	verf[1] = (__be32)nn->nfssvc_boot.tv_usec;

	/*

	 * This is opaque to client, so no need to byte-swap. Use

	 * __force to keep sparse happy

	 */

	verf[0] = (__force __be32)nn->nfssvc_boot.tv_sec;

	verf[1] = (__force __be32)nn->nfssvc_boot.tv_usec;

	memcpy(verifier->data, verf, sizeof(verifier->data));

}

fs/nfsd/nfs4state.c

+6 −2
Original line number Diff line number Diff line
@@ -1421,8 +1421,12 @@ static void gen_confirm(struct nfs4_client *clp) 
	__be32 verf[2];

	static u32 i;



	verf[0] = (__be32)get_seconds();

	verf[1] = (__be32)i++;

	/*

	 * This is opaque to client, so no need to byte-swap. Use

	 * __force to keep sparse happy

	 */

	verf[0] = (__force __be32)get_seconds();

	verf[1] = (__force __be32)i++;

	memcpy(clp->cl_confirm.data, verf, sizeof(clp->cl_confirm.data));

}