Commit 70536bf4 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Clean up reset of the mirror accounting variables 



Now that nfs_pageio_do_add_request() resets the pg_count, we don't need
these other inlined resets.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 0d0ea309

fs/nfs/pagelist.c

+1 −8
Original line number Diff line number Diff line
@@ -1132,12 +1132,8 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc) 
		int error = desc->pg_ops->pg_doio(desc);

		if (error < 0)

			desc->pg_error = error;

		if (list_empty(&mirror->pg_list)) {

		if (list_empty(&mirror->pg_list))

			mirror->pg_bytes_written += mirror->pg_count;

			mirror->pg_count = 0;

			mirror->pg_base = 0;

			mirror->pg_recoalesce = 0;

		}

	}

}
@@ -1227,9 +1223,6 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc) 


	do {

		list_splice_init(&mirror->pg_list, &head);

		mirror->pg_count = 0;

		mirror->pg_base = 0;

		mirror->pg_recoalesce = 0;



		while (!list_empty(&head)) {

			struct nfs_page *req;