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

Commit 1c48cee8 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

pNFS/flexfiles: delete deviceid, don't mark inactive 



Instead of marking a device inactive, remove it from the cache entirely.

Flexfiles has a way to report errors back to the server, so we don't want
to stop devices from being tried again for 120 seconds.

Signed-off-by: default avatarWeston Andros Adamson <dros@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 187e593d

fs/nfs/flexfilelayout/flexfilelayout.c

+4 −2
Original line number Diff line number Diff line
@@ -1126,7 +1126,8 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task, 
	case -EPIPE:

		dprintk("%s DS connection error %d\n", __func__,

			task->tk_status);

		nfs4_mark_deviceid_unavailable(devid);

		nfs4_delete_deviceid(devid->ld, devid->nfs_client,

				&devid->deviceid);

		rpc_wake_up(&tbl->slot_tbl_waitq);

		/* fall through */

	default:
@@ -1175,7 +1176,8 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task, 
	default:

		dprintk("%s DS connection error %d\n", __func__,

			task->tk_status);

		nfs4_mark_deviceid_unavailable(devid);

		nfs4_delete_deviceid(devid->ld, devid->nfs_client,

				&devid->deviceid);

	}

	/* FIXME: Need to prevent infinite looping here. */

	return -NFS4ERR_RESET_TO_PNFS;

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev, 
static void ff_layout_mark_devid_invalid(struct pnfs_layout_segment *lseg,

		struct nfs4_deviceid_node *devid)

{

	nfs4_mark_deviceid_unavailable(devid);

	nfs4_delete_deviceid(devid->ld, devid->nfs_client, &devid->deviceid);

	if (!ff_layout_has_available_ds(lseg))

		pnfs_error_mark_layout_for_return(lseg->pls_layout->plh_inode,

				lseg);