Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7af46292 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS/flexfiles: Don't time out requests on hard mounts 



If the mount is hard, we should ignore the 'io_maxretrans' module
parameter so that we always keep retrying.

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

fs/nfs/flexfilelayout/flexfilelayout.c

+9 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/nfs_fs.h>

#include <linux/nfs_mount.h>

#include <linux/nfs_page.h>

#include <linux/module.h>

#include <linux/sched/mm.h>
@@ -928,6 +929,8 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio, 
	pgm = &pgio->pg_mirrors[0];

	pgm->pg_bsize = mirror->mirror_ds->ds_versions[0].rsize;



	if (NFS_SERVER(pgio->pg_inode)->flags &

			(NFS_MOUNT_SOFT|NFS_MOUNT_SOFTERR))

		pgio->pg_maxretrans = io_maxretrans;

	return;

out_nolseg:
@@ -940,6 +943,7 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio, 
			pgio->pg_lseg);

	pnfs_put_lseg(pgio->pg_lseg);

	pgio->pg_lseg = NULL;

	pgio->pg_maxretrans = 0;

	nfs_pageio_reset_read_mds(pgio);

}
@@ -1000,6 +1004,8 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio, 
		pgm->pg_bsize = mirror->mirror_ds->ds_versions[0].wsize;

	}



	if (NFS_SERVER(pgio->pg_inode)->flags &

			(NFS_MOUNT_SOFT|NFS_MOUNT_SOFTERR))

		pgio->pg_maxretrans = io_maxretrans;

	return;
@@ -1010,6 +1016,7 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio, 
			pgio->pg_lseg);

	pnfs_put_lseg(pgio->pg_lseg);

	pgio->pg_lseg = NULL;

	pgio->pg_maxretrans = 0;

	nfs_pageio_reset_write_mds(pgio);

}