Commit f47dc2d3 authored by Dai Ngo's avatar Dai Ngo Committed by J. Bruce Fields
Browse files

nfsd: fix kernel test robot warning in SSC code 



Fix by initializing pointer nfsd4_ssc_umount_item with NULL instead of 0.
Replace return value of nfsd4_ssc_setup_dul with __be32 instead of int.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarDai Ngo <dai.ngo@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 3518c866

fs/nfsd/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ extern void nfs_sb_deactive(struct super_block *sb); 
/*

 * setup a work entry in the ssc delayed unmount list.

 */

static int nfsd4_ssc_setup_dul(struct nfsd_net *nn, char *ipaddr,

static __be32 nfsd4_ssc_setup_dul(struct nfsd_net *nn, char *ipaddr,

		struct nfsd4_ssc_umount_item **retwork, struct vfsmount **ss_mnt)

{

	struct nfsd4_ssc_umount_item *ni = 0;
@@ -1399,7 +1399,7 @@ nfsd4_cleanup_inter_ssc(struct vfsmount *ss_mnt, struct nfsd_file *src, 
	bool found = false;

	long timeout;

	struct nfsd4_ssc_umount_item *tmp;

	struct nfsd4_ssc_umount_item *ni = 0;

	struct nfsd4_ssc_umount_item *ni = NULL;

	struct nfsd_net *nn = net_generic(dst->nf_net, nfsd_net_id);



	nfs42_ssc_close(src->nf_file);

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -5514,7 +5514,7 @@ EXPORT_SYMBOL_GPL(nfsd4_ssc_init_umount_work); 
 */

static void nfsd4_ssc_shutdown_umount(struct nfsd_net *nn)

{

	struct nfsd4_ssc_umount_item *ni = 0;

	struct nfsd4_ssc_umount_item *ni = NULL;

	struct nfsd4_ssc_umount_item *tmp;



	spin_lock(&nn->nfsd_ssc_lock);