mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 18:20:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

NFSD: Fix sparse warning in nfs4proc.c

Browse source 
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: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-11-30 16:17:40 -05:00
parent 5e54dafbe0
commit eb162e1772
1 changed files with 2 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
fs/nfsd/nfs4proc.c
View file

@ -1425,7 +1425,7 @@ static __be32 nfsd4_do_copy(struct nfsd4_copy *copy, bool sync)
return status; 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_src_pos = src->cp_src_pos;
dst->cp_dst_pos = src->cp_dst_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->stateid, &src->stateid, sizeof(src->stateid));
memcpy(&dst->c_fh, &src->c_fh, sizeof(src->c_fh)); memcpy(&dst->c_fh, &src->c_fh, sizeof(src->c_fh));
dst->ss_mnt = src->ss_mnt; dst->ss_mnt = src->ss_mnt;
return 0;
} }
static void cleanup_async_copy(struct nfsd4_copy *copy) 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); refcount_set(&async_copy->refcount, 1);
memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid, memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid,
sizeof(copy->cp_stateid)); sizeof(copy->cp_stateid));
status = dup_copy_fields(copy, async_copy); dup_copy_fields(copy, async_copy);
if (status)
goto out_err;
async_copy->copy_task = kthread_create(nfsd4_do_async_copy, async_copy->copy_task = kthread_create(nfsd4_do_async_copy,
async_copy, "%s", "copy thread"); async_copy, "%s", "copy thread");
if (IS_ERR(async_copy->copy_task)) if (IS_ERR(async_copy->copy_task))