Commit 844c9e69 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Create a common pgio_error function 



At this point, the read and write versions of this function look
identical so both should use the same function.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ce59515c

fs/nfs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ struct nfs_rw_header *nfs_rw_header_alloc(const struct nfs_rw_ops *); 
void nfs_rw_header_free(struct nfs_pgio_header *);

struct nfs_pgio_data *nfs_pgio_data_alloc(struct nfs_pgio_header *, unsigned int);

void nfs_pgio_data_release(struct nfs_pgio_data *);

int nfs_pgio_error(struct nfs_pageio_descriptor *, struct nfs_pgio_header *);

void nfs_pgio_rpcsetup(struct nfs_pgio_data *, unsigned int, unsigned int, int,

		       struct nfs_commit_info *);

fs/nfs/pagelist.c

+20 −0
Original line number Diff line number Diff line
@@ -446,6 +446,26 @@ static void nfs_pgio_prepare(struct rpc_task *task, void *calldata) 
		rpc_exit(task, err);

}



/**

 * nfs_pgio_error - Clean up from a pageio error

 * @desc: IO descriptor

 * @hdr: pageio header

 */

int nfs_pgio_error(struct nfs_pageio_descriptor *desc,

			  struct nfs_pgio_header *hdr)

{

	struct nfs_pgio_data *data;



	set_bit(NFS_IOHDR_REDO, &hdr->flags);

	while (!list_empty(&hdr->rpc_list)) {

		data = list_first_entry(&hdr->rpc_list, struct nfs_pgio_data, list);

		list_del(&data->list);

		nfs_pgio_data_release(data);

	}

	desc->pg_completion_ops->error_cleanup(&desc->pg_list);

	return -ENOMEM;

}



/**

 * nfs_pgio_release - Release pageio data

 * @calldata: The pageio data to release

fs/nfs/read.c

+4 −21
Original line number Diff line number Diff line
@@ -237,19 +237,6 @@ static const struct nfs_pgio_completion_ops nfs_async_read_completion_ops = { 
	.completion = nfs_read_completion,

};



static void nfs_pagein_error(struct nfs_pageio_descriptor *desc,

		struct nfs_pgio_header *hdr)

{

	set_bit(NFS_IOHDR_REDO, &hdr->flags);

	while (!list_empty(&hdr->rpc_list)) {

		struct nfs_pgio_data *data = list_first_entry(&hdr->rpc_list,

				struct nfs_pgio_data, list);

		list_del(&data->list);

		nfs_pgio_data_release(data);

	}

	desc->pg_completion_ops->error_cleanup(&desc->pg_list);

}



/*

 * Generate multiple requests to fill a single page.

 *
@@ -278,10 +265,8 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc, 
		size_t len = min(nbytes,rsize);



		data = nfs_pgio_data_alloc(hdr, 1);

		if (!data) {

			nfs_pagein_error(desc, hdr);

			return -ENOMEM;

		}

		if (!data)

			return nfs_pgio_error(desc, hdr);

		data->pages.pagevec[0] = page;

		nfs_pgio_rpcsetup(data, len, offset, 0, NULL);

		list_add(&data->list, &hdr->rpc_list);
@@ -305,10 +290,8 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc, 


	data = nfs_pgio_data_alloc(hdr, nfs_page_array_len(desc->pg_base,

							  desc->pg_count));

	if (!data) {

		nfs_pagein_error(desc, hdr);

		return -ENOMEM;

	}

	if (!data)

		return nfs_pgio_error(desc, hdr);



	pages = data->pages.pagevec;

	while (!list_empty(head)) {

fs/nfs/write.c

+4 −21
Original line number Diff line number Diff line
@@ -1044,19 +1044,6 @@ static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops = { 
	.completion = nfs_write_completion,

};



static void nfs_flush_error(struct nfs_pageio_descriptor *desc,

		struct nfs_pgio_header *hdr)

{

	set_bit(NFS_IOHDR_REDO, &hdr->flags);

	while (!list_empty(&hdr->rpc_list)) {

		struct nfs_pgio_data *data = list_first_entry(&hdr->rpc_list,

				struct nfs_pgio_data, list);

		list_del(&data->list);

		nfs_pgio_data_release(data);

	}

	desc->pg_completion_ops->error_cleanup(&desc->pg_list);

}



/*

 * Generate multiple small requests to write out a single

 * contiguous dirty area on one page.
@@ -1086,10 +1073,8 @@ static int nfs_flush_multi(struct nfs_pageio_descriptor *desc, 
		size_t len = min(nbytes, wsize);



		data = nfs_pgio_data_alloc(hdr, 1);

		if (!data) {

			nfs_flush_error(desc, hdr);

			return -ENOMEM;

		}

		if (!data)

			return nfs_pgio_error(desc, hdr);

		data->pages.pagevec[0] = page;

		nfs_pgio_rpcsetup(data, len, offset, desc->pg_ioflags, &cinfo);

		list_add(&data->list, &hdr->rpc_list);
@@ -1122,10 +1107,8 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc, 


	data = nfs_pgio_data_alloc(hdr, nfs_page_array_len(desc->pg_base,

							   desc->pg_count));

	if (!data) {

		nfs_flush_error(desc, hdr);

		return -ENOMEM;

	}

	if (!data)

		return nfs_pgio_error(desc, hdr);



	nfs_init_cinfo(&cinfo, desc->pg_inode, desc->pg_dreq);

	pages = data->pages.pagevec;