Commit 377840ee authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Remove the redundant function nfs_pgio_has_mirroring() 



We need to trust that desc->pg_mirror_idx is set correctly, whether
or not mirroring is enabled.

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

fs/nfs/internal.h

+0 −6
Original line number Diff line number Diff line
@@ -274,12 +274,6 @@ void nfs_free_request(struct nfs_page *req); 
struct nfs_pgio_mirror *

nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc);



static inline bool nfs_pgio_has_mirroring(struct nfs_pageio_descriptor *desc)

{

	WARN_ON_ONCE(desc->pg_mirror_count < 1);

	return desc->pg_mirror_count > 1;

}



static inline bool nfs_match_open_context(const struct nfs_open_context *ctx1,

		const struct nfs_open_context *ctx2)

{

fs/nfs/pagelist.c

+2 −5
Original line number Diff line number Diff line
@@ -33,9 +33,7 @@ static const struct rpc_call_ops nfs_pgio_common_ops; 
struct nfs_pgio_mirror *

nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc)

{

	return nfs_pgio_has_mirroring(desc) ?

		&desc->pg_mirrors[desc->pg_mirror_idx] :

		&desc->pg_mirrors[0];

	return &desc->pg_mirrors[desc->pg_mirror_idx];

}

EXPORT_SYMBOL_GPL(nfs_pgio_current_mirror);
@@ -1231,7 +1229,6 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc, 
	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[mirror_idx];

	u32 restore_idx = desc->pg_mirror_idx;



	if (nfs_pgio_has_mirroring(desc))

	desc->pg_mirror_idx = mirror_idx;

	for (;;) {

		nfs_pageio_doio(desc);