Commit c695ac2d authored by Anna Schumaker's avatar Anna Schumaker
Browse files

NFS: Move nfs40_shutdown_client into nfs40client.c 



Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
parent c30493d8

fs/nfs/nfs40.h

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
#define __LINUX_FS_NFS_NFS4_0_H





/* nfs40client.c */

void nfs40_shutdown_client(struct nfs_client *);



/* nfs40proc.c */

extern const struct nfs4_minor_version_ops nfs_v4_0_minor_ops;

fs/nfs/nfs40client.c

+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#include <linux/nfs_fs.h>

#include "nfs4_fs.h"

#include "nfs4session.h"

#include "callback.h"

#include "internal.h"

#include "netns.h"
@@ -44,6 +45,14 @@ static bool nfs4_same_verifier(nfs4_verifier *v1, nfs4_verifier *v2) 
	return memcmp(v1->data, v2->data, sizeof(v1->data)) == 0;

}



void nfs40_shutdown_client(struct nfs_client *clp)

{

	if (clp->cl_slot_tbl) {

		nfs4_shutdown_slot_table(clp->cl_slot_tbl);

		kfree(clp->cl_slot_tbl);

	}

}



/**

 * nfs40_walk_client_list - Find server that recognizes a client ID

 *

fs/nfs/nfs40proc.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/nfs_fs.h>

#include "internal.h"

#include "nfs4_fs.h"

#include "nfs40.h"

#include "nfs4trace.h"



static void nfs40_call_sync_prepare(struct rpc_task *task, void *calldata)

fs/nfs/nfs4_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ extern const u32 nfs4_pathconf_bitmap[3]; 
extern const u32 nfs4_fsinfo_bitmap[3];

extern const u32 nfs4_fs_locations_bitmap[3];



void nfs40_shutdown_client(struct nfs_client *);

void nfs41_shutdown_client(struct nfs_client *);

int nfs40_init_client(struct nfs_client *);

int nfs41_init_client(struct nfs_client *);

fs/nfs/nfs4client.c

+0 −8
Original line number Diff line number Diff line
@@ -189,14 +189,6 @@ void nfs41_shutdown_client(struct nfs_client *clp) 
}

#endif	/* CONFIG_NFS_V4_1 */



void nfs40_shutdown_client(struct nfs_client *clp)

{

	if (clp->cl_slot_tbl) {

		nfs4_shutdown_slot_table(clp->cl_slot_tbl);

		kfree(clp->cl_slot_tbl);

	}

}



struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)

{

	char buf[INET6_ADDRSTRLEN + 1];