Commit 5c0b4129 authored Jan 06, 2012 by Boaz Harrosh Committed by Trond Myklebust Jan 06, 2012

pnfs-obj: pNFS errors are communicated on iodata->pnfs_error



Some time along the way pNFS IO errors were switched to
communicate with a special iodata->pnfs_error member instead
of the regular RPC members. But objlayout was not switched
over.

Fix that!
Without this fix any IO error is hanged, because IO is not
switched to MDS and pages are never cleared or read.

[Applies to 3.2.0. Same bug different patch for 3.1/0 Kernels]
CC: Stable Tree <stable@kernel.org>
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 0aaaf5c4

fs/nfs/objlayout/objlayout.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,8 @@ objlayout_read_done(struct objlayout_io_res *oir, ssize_t status, bool sync)
		oir->status = rdata->task.tk_status = status;
		if (status >= 0)
		rdata->res.count = status;
		else
		rdata->pnfs_error = status;
		objlayout_iodone(oir);
		/* must not use oir after this point */

		@@ -334,6 +336,8 @@ objlayout_write_done(struct objlayout_io_res *oir, ssize_t status, bool sync)
		if (status >= 0) {
		wdata->res.count = status;
		wdata->verf.committed = oir->committed;
		} else {
		wdata->pnfs_error = status;
		}
		objlayout_iodone(oir);
		/* must not use oir after this point */