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

Commit 8ce160c5 authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

pnfs: recoalesce when ld write pagelist fails 



For pnfs pagelist write failure, we need to pg_recoalesce and resend IO to
mds.

Signed-off-by: default avatarPeng Tao <peng_tao@emc.com>
Signed-off-by: default avatarJim Rees <rees@umich.edu>
Cc: stable@kernel.org [3.0]
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1b0ae068

fs/nfs/pnfs.c

+7 −13
Original line number Diff line number Diff line
@@ -1168,23 +1168,17 @@ EXPORT_SYMBOL_GPL(pnfs_generic_pg_test); 
/*

 * Called by non rpc-based layout drivers

 */

int

pnfs_ld_write_done(struct nfs_write_data *data)

void pnfs_ld_write_done(struct nfs_write_data *data)

{

	int status;



	if (!data->pnfs_error) {

	if (likely(!data->pnfs_error)) {

		pnfs_set_layoutcommit(data);

		data->mds_ops->rpc_call_done(&data->task, data);

		data->mds_ops->rpc_release(data);

		return 0;

	} else {

		put_lseg(data->lseg);

		data->lseg = NULL;

		dprintk("pnfs write error = %d\n", data->pnfs_error);

	}



	dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__,

		data->pnfs_error);

	status = nfs_initiate_write(data, NFS_CLIENT(data->inode),

				    data->mds_ops, NFS_FILE_SYNC);

	return status ? : -EAGAIN;

	data->mds_ops->rpc_release(data);

}

EXPORT_SYMBOL_GPL(pnfs_ld_write_done);

fs/nfs/pnfs.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ void pnfs_set_layoutcommit(struct nfs_write_data *wdata); 
void pnfs_cleanup_layoutcommit(struct nfs4_layoutcommit_data *data);

int pnfs_layoutcommit_inode(struct inode *inode, bool sync);

int _pnfs_return_layout(struct inode *);

int pnfs_ld_write_done(struct nfs_write_data *);

void pnfs_ld_write_done(struct nfs_write_data *);

int pnfs_ld_read_done(struct nfs_read_data *);

struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino,

					       struct nfs_open_context *ctx,

fs/nfs/write.c

+24 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,13 @@ static void nfs_writeback_done_full(struct rpc_task *task, void *calldata) 
static void nfs_writeback_release_full(void *calldata)

{

	struct nfs_write_data	*data = calldata;

	int status = data->task.tk_status;

	int ret, status = data->task.tk_status;

	struct nfs_pageio_descriptor pgio;



	if (data->pnfs_error) {

		nfs_pageio_init_write_mds(&pgio, data->inode, FLUSH_STABLE);

		pgio.pg_recoalesce = 1;

	}



	/* Update attributes as result of writeback. */

	while (!list_empty(&data->pages)) {
@@ -1182,6 +1188,11 @@ static void nfs_writeback_release_full(void *calldata) 
			req->wb_bytes,

			(long long)req_offset(req));



		if (data->pnfs_error) {

			dprintk(", pnfs error = %d\n", data->pnfs_error);

			goto next;

		}



		if (status < 0) {

			nfs_set_pageerror(page);

			nfs_context_set_write_error(req->wb_context, status);
@@ -1201,7 +1212,19 @@ static void nfs_writeback_release_full(void *calldata) 
	next:

		nfs_clear_page_tag_locked(req);

		nfs_end_page_writeback(page);

		if (data->pnfs_error) {

			lock_page(page);

			nfs_pageio_cond_complete(&pgio, page->index);

			ret = nfs_page_async_flush(&pgio, page, 0);

			if (ret) {

				nfs_set_pageerror(page);

				dprintk("rewrite to MDS error = %d\n", ret);

			}

			unlock_page(page);

		}

	}

	if (data->pnfs_error)

		nfs_pageio_complete(&pgio);

	nfs_writedata_release(calldata);

}