xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: fix kernel test robot warning in SSC code

Browse Source 
[ Upstream commit f47dc2d3013c65631bf8903becc7d88dc9d9966e ]

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: kernel test robot <lkp@intel.com>
Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dai Ngo
2021-06-03 20:02:26 -04:00
committed by Greg Kroah-Hartman
parent 22b7c93d96
commit c5a305d93e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfs4proc.c
View File

@@ -1178,7 +1178,7 @@ extern void nfs_sb_deactive(struct super_block *sb);
/* /*
* setup a work entry in the ssc delayed unmount list. * 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 **retwork, struct vfsmount **ss_mnt)
{ {
struct nfsd4_ssc_umount_item *ni = 0; struct nfsd4_ssc_umount_item *ni = 0;
@@ -1395,7 +1395,7 @@ nfsd4_cleanup_inter_ssc(struct vfsmount *ss_mnt, struct nfsd_file *src,
bool found = false; bool found = false;
long timeout; long timeout;
struct nfsd4_ssc_umount_item *tmp; 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); struct nfsd_net *nn = net_generic(dst->nf_net, nfsd_net_id);
nfs42_ssc_close(src->nf_file); nfs42_ssc_close(src->nf_file);

2
fs/nfsd/nfs4state.c
View File

@@ -5556,7 +5556,7 @@ EXPORT_SYMBOL_GPL(nfsd4_ssc_init_umount_work);
*/ */
static void nfsd4_ssc_shutdown_umount(struct nfsd_net *nn) 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; struct nfsd4_ssc_umount_item *tmp;
spin_lock(&nn->nfsd_ssc_lock); spin_lock(&nn->nfsd_ssc_lock);