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

Commit 66b53f32 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS: Handle NFS4ERR_RECALLCONFLICT correctly in LAYOUTGET 



Instead of giving up altogether and falling back to doing I/O
through the MDS, which may make the situation worse, wait for
2 lease periods for the callback to resolve itself, and then
try destroying the existing layout.

Only if this was an attempt at getting a first layout, do we
give up altogether, as the server is clearly crazy.

Fixes: 183d9e7b ("pnfs: rework LAYOUTGET retry handling")
Cc: stable@vger.kernel.org # 4.7
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
parent e85d7ee4

fs/nfs/pnfs.c

+11 −2
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ pnfs_update_layout(struct inode *ino, 
	struct pnfs_layout_segment *lseg = NULL;

	nfs4_stateid stateid;

	long timeout = 0;

	unsigned long giveup = jiffies + rpc_get_timeout(server->client);

	unsigned long giveup = jiffies + (clp->cl_lease_time << 1);

	bool first;



	if (!pnfs_enabled_sb(NFS_SERVER(ino))) {
@@ -1649,9 +1649,18 @@ pnfs_update_layout(struct inode *ino, 
	if (IS_ERR(lseg)) {

		switch(PTR_ERR(lseg)) {

		case -EBUSY:

		case -ERECALLCONFLICT:

			if (time_after(jiffies, giveup))

				lseg = NULL;

			break;

		case -ERECALLCONFLICT:

			/* Huh? We hold no layouts, how is there a recall? */

			if (first) {

				lseg = NULL;

				break;

			}

			/* Destroy the existing layout and start over */

			if (time_after(jiffies, giveup))

				pnfs_destroy_layout(NFS_I(ino));

			/* Fallthrough */

		case -EAGAIN:

			break;