Skip to content

Commit eb162e1

Browse files
committed
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: Chuck Lever <chuck.lever@oracle.com>
1 parent 5e54daf commit eb162e1

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

fs/nfsd/nfs4proc.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ static __be32 nfsd4_do_copy(struct nfsd4_copy *copy, bool sync)
14251425
return status;
14261426
}
14271427

1428-
static int dup_copy_fields(struct nfsd4_copy *src, struct nfsd4_copy *dst)
1428+
static void dup_copy_fields(struct nfsd4_copy *src, struct nfsd4_copy *dst)
14291429
{
14301430
dst->cp_src_pos = src->cp_src_pos;
14311431
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)
14441444
memcpy(&dst->stateid, &src->stateid, sizeof(src->stateid));
14451445
memcpy(&dst->c_fh, &src->c_fh, sizeof(src->c_fh));
14461446
dst->ss_mnt = src->ss_mnt;
1447-
1448-
return 0;
14491447
}
14501448

14511449
static void cleanup_async_copy(struct nfsd4_copy *copy)
@@ -1539,9 +1537,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
15391537
refcount_set(&async_copy->refcount, 1);
15401538
memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid,
15411539
sizeof(copy->cp_stateid));
1542-
status = dup_copy_fields(copy, async_copy);
1543-
if (status)
1544-
goto out_err;
1540+
dup_copy_fields(copy, async_copy);
15451541
async_copy->copy_task = kthread_create(nfsd4_do_async_copy,
15461542
async_copy, "%s", "copy thread");
15471543
if (IS_ERR(async_copy->copy_task))

0 commit comments

Comments
 (0)