Commit 561d6f8a authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS/flexfiles: Simplify nfs4_ff_find_or_create_ds_client() 



Pass in a pointer to the mirror rather than forcing another
array access.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 749da527

fs/nfs/flexfilelayout/flexfilelayout.c

+3 −3
Original line number Diff line number Diff line
@@ -1778,7 +1778,7 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) 
	if (!ds)

		goto out_failed;



	ds_clnt = nfs4_ff_find_or_create_ds_client(lseg, idx, ds->ds_clp,

	ds_clnt = nfs4_ff_find_or_create_ds_client(mirror, ds->ds_clp,

						   hdr->inode);

	if (IS_ERR(ds_clnt))

		goto out_failed;
@@ -1843,7 +1843,7 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync) 
	if (!ds)

		goto out_failed;



	ds_clnt = nfs4_ff_find_or_create_ds_client(lseg, idx, ds->ds_clp,

	ds_clnt = nfs4_ff_find_or_create_ds_client(mirror, ds->ds_clp,

						   hdr->inode);

	if (IS_ERR(ds_clnt))

		goto out_failed;
@@ -1928,7 +1928,7 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how) 
	if (!ds)

		goto out_err;



	ds_clnt = nfs4_ff_find_or_create_ds_client(lseg, idx, ds->ds_clp,

	ds_clnt = nfs4_ff_find_or_create_ds_client(mirror, ds->ds_clp,

						   data->inode);

	if (IS_ERR(ds_clnt))

		goto out_err;

fs/nfs/flexfilelayout/flexfilelayout.h

+1 −2
Original line number Diff line number Diff line
@@ -215,8 +215,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, 
			  bool fail_return);



struct rpc_clnt *

nfs4_ff_find_or_create_ds_client(struct pnfs_layout_segment *lseg,

				 u32 ds_idx,

nfs4_ff_find_or_create_ds_client(struct nfs4_ff_layout_mirror *mirror,

				 struct nfs_client *ds_clp,

				 struct inode *inode);

const struct cred *ff_layout_get_ds_cred(struct pnfs_layout_segment *lseg,

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+2 −5
Original line number Diff line number Diff line
@@ -464,8 +464,7 @@ ff_layout_get_ds_cred(struct pnfs_layout_segment *lseg, u32 ds_idx, 


/**

 * nfs4_ff_find_or_create_ds_client - Find or create a DS rpc client

 * @lseg: pointer to layout segment

 * @ds_idx: mirror index

 * @mirror: pointer to the mirror

 * @ds_clp: nfs_client for the DS

 * @inode: pointer to inode

 *
@@ -473,11 +472,9 @@ ff_layout_get_ds_cred(struct pnfs_layout_segment *lseg, u32 ds_idx, 
 * in the nfs_client cl_ds_clients list.

 */

struct rpc_clnt *

nfs4_ff_find_or_create_ds_client(struct pnfs_layout_segment *lseg, u32 ds_idx,

nfs4_ff_find_or_create_ds_client(struct nfs4_ff_layout_mirror *mirror,

				 struct nfs_client *ds_clp, struct inode *inode)

{

	struct nfs4_ff_layout_mirror *mirror = FF_LAYOUT_COMP(lseg, ds_idx);



	switch (mirror->mirror_ds->ds_versions[0].version) {

	case 3:

		/* For NFSv3 DS, flavor is set when creating DS connections */

CRA Git | Maintained and supported by SUSTech CRA and CCSE