Commit eb162e17 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Fix sparse warning in nfs4proc.c 



linux/fs/nfsd/nfs4proc.c:1542:24: warning: incorrect type in assignment (different base types)
linux/fs/nfsd/nfs4proc.c:1542:24:    expected restricted __be32 [assigned] [usertype] status
linux/fs/nfsd/nfs4proc.c:1542:24:    got int

Clean-up: The dup_copy_fields() function returns only zero, so make
it return void for now, and get rid of the return code check.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 5e54dafb

fs/nfsd/nfs4proc.c

+2 −6
Original line number Diff line number Diff line
@@ -1425,7 +1425,7 @@ static __be32 nfsd4_do_copy(struct nfsd4_copy *copy, bool sync) 
	return status;

}



static int dup_copy_fields(struct nfsd4_copy *src, struct nfsd4_copy *dst)

static void dup_copy_fields(struct nfsd4_copy *src, struct nfsd4_copy *dst)

{

	dst->cp_src_pos = src->cp_src_pos;

	dst->cp_dst_pos = src->cp_dst_pos;
@@ -1444,8 +1444,6 @@ static int dup_copy_fields(struct nfsd4_copy *src, struct nfsd4_copy *dst) 
	memcpy(&dst->stateid, &src->stateid, sizeof(src->stateid));

	memcpy(&dst->c_fh, &src->c_fh, sizeof(src->c_fh));

	dst->ss_mnt = src->ss_mnt;



	return 0;

}



static void cleanup_async_copy(struct nfsd4_copy *copy)
@@ -1539,9 +1537,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		refcount_set(&async_copy->refcount, 1);

		memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid,

			sizeof(copy->cp_stateid));

		status = dup_copy_fields(copy, async_copy);

		if (status)

			goto out_err;

		dup_copy_fields(copy, async_copy);

		async_copy->copy_task = kthread_create(nfsd4_do_async_copy,

				async_copy, "%s", "copy thread");

		if (IS_ERR(async_copy->copy_task))