nfs: only reset desc->pg_mirror_idx when mirroring is supported

[firefly-linux-kernel-4.4.55.git] / fs / nfs / pagelist.c

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index eec12b75c2325fc305625fd38ec985b38fcb6b4a..f9d8c4691149709d894596ea432d213edd25ddf3 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -1021,8 +1021,6 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
        unsigned int bytes_left = 0;
        unsigned int offset, pgbase;
 
-       WARN_ON_ONCE(desc->pg_mirror_idx >= desc->pg_mirror_count);
-
        nfs_page_group_lock(req, false);
 
        subreq = req;
@@ -1162,7 +1160,8 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
                } else
                        dupreq = req;
 
-               desc->pg_mirror_idx = midx;
+               if (nfs_pgio_has_mirroring(desc))
+                       desc->pg_mirror_idx = midx;
                if (!nfs_pageio_add_request_mirror(desc, dupreq))
                        return 0;
        }
@@ -1181,7 +1180,8 @@ 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;
 
-       desc->pg_mirror_idx = mirror_idx;
+       if (nfs_pgio_has_mirroring(desc))
+               desc->pg_mirror_idx = mirror_idx;
        for (;;) {
                nfs_pageio_doio(desc);
                if (!mirror->pg_recoalesce)