iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Remove the redundant function nfs_pgio_has_mirroring()

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

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2020-03-29 20:03:33 -04:00
parent 862f35c947
commit 377840ee48
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/internal.h
View File

@ -274,12 +274,6 @@ void nfs_free_request(struct nfs_page *req);
struct nfs_pgio_mirror * struct nfs_pgio_mirror *
nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc); 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, static inline bool nfs_match_open_context(const struct nfs_open_context *ctx1,
const struct nfs_open_context *ctx2) const struct nfs_open_context *ctx2)
{ {

7
fs/nfs/pagelist.c
View File

@ -33,9 +33,7 @@ static const struct rpc_call_ops nfs_pgio_common_ops;
struct nfs_pgio_mirror * struct nfs_pgio_mirror *
nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc) nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc)
{ {
return nfs_pgio_has_mirroring(desc) ? return &desc->pg_mirrors[desc->pg_mirror_idx];
&desc->pg_mirrors[desc->pg_mirror_idx] :
&desc->pg_mirrors[0];
} }
EXPORT_SYMBOL_GPL(nfs_pgio_current_mirror); EXPORT_SYMBOL_GPL(nfs_pgio_current_mirror);
@ -1231,8 +1229,7 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc,
struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[mirror_idx]; struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[mirror_idx];
u32 restore_idx = desc->pg_mirror_idx; u32 restore_idx = desc->pg_mirror_idx;
if (nfs_pgio_has_mirroring(desc)) desc->pg_mirror_idx = mirror_idx;
desc->pg_mirror_idx = mirror_idx;
for (;;) { for (;;) {
nfs_pageio_doio(desc); nfs_pageio_doio(desc);
if (desc->pg_error < 0 || !mirror->pg_recoalesce) if (desc->pg_error < 0 || !mirror->pg_recoalesce)