Commit 214359fe authored by Anna Schumaker's avatar Anna Schumaker
Browse files

NFS: Move nfs40_init_client into nfs40client.c 



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

fs/nfs/nfs40.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


/* nfs40client.c */

void nfs40_shutdown_client(struct nfs_client *);

int nfs40_init_client(struct nfs_client *);



/* nfs40proc.c */

extern const struct nfs4_minor_version_ops nfs_v4_0_minor_ops;

fs/nfs/nfs40client.c

+27 −0
Original line number Diff line number Diff line
@@ -53,6 +53,33 @@ void nfs40_shutdown_client(struct nfs_client *clp) 
	}

}



/**

 * nfs40_init_client - nfs_client initialization tasks for NFSv4.0

 * @clp: nfs_client to initialize

 *

 * Returns zero on success, or a negative errno if some error occurred.

 */

int nfs40_init_client(struct nfs_client *clp)

{

	struct nfs4_slot_table *tbl;

	int ret;



	tbl = kzalloc(sizeof(*tbl), GFP_NOFS);

	if (tbl == NULL)

		return -ENOMEM;



	ret = nfs4_setup_slot_table(tbl, NFS4_MAX_SLOT_TABLE,

					"NFSv4.0 transport Slot table");

	if (ret) {

		nfs4_shutdown_slot_table(tbl);

		kfree(tbl);

		return ret;

	}



	clp->cl_slot_tbl = tbl;

	return 0;

}



/**

 * nfs40_walk_client_list - Find server that recognizes a client ID

 *

fs/nfs/nfs4_fs.h

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



void nfs41_shutdown_client(struct nfs_client *);

int nfs40_init_client(struct nfs_client *);

int nfs41_init_client(struct nfs_client *);

void nfs4_free_client(struct nfs_client *);

fs/nfs/nfs4client.c

+0 −27
Original line number Diff line number Diff line
@@ -331,33 +331,6 @@ static int nfs4_init_callback(struct nfs_client *clp) 
	return 0;

}



/**

 * nfs40_init_client - nfs_client initialization tasks for NFSv4.0

 * @clp: nfs_client to initialize

 *

 * Returns zero on success, or a negative errno if some error occurred.

 */

int nfs40_init_client(struct nfs_client *clp)

{

	struct nfs4_slot_table *tbl;

	int ret;



	tbl = kzalloc(sizeof(*tbl), GFP_NOFS);

	if (tbl == NULL)

		return -ENOMEM;



	ret = nfs4_setup_slot_table(tbl, NFS4_MAX_SLOT_TABLE,

					"NFSv4.0 transport Slot table");

	if (ret) {

		nfs4_shutdown_slot_table(tbl);

		kfree(tbl);

		return ret;

	}



	clp->cl_slot_tbl = tbl;

	return 0;

}



#if defined(CONFIG_NFS_V4_1)



/**