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

Commit fbb5a9ab authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Get rid of unnecessary calls to ClearPageError() in read code 



The generic file read code does that for us anyway.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d00c5d43

fs/nfs/read.c

+0 −2
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc, struct list_head 
		offset += len;

	} while(nbytes != 0);

	atomic_set(&req->wb_complete, requests);

	ClearPageError(page);

	desc->pg_rpc_callops = &nfs_read_partial_ops;

	return ret;

out_bad:
@@ -357,7 +356,6 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc, struct list_head * 
		req = nfs_list_entry(head->next);

		nfs_list_remove_request(req);

		nfs_list_add_request(req, &data->pages);

		ClearPageError(req->wb_page);

		*pages++ = req->wb_page;

	}

	req = nfs_list_entry(data->pages.next);

fs/nfs/write.c

+0 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,6 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc, struct list_head *r 
		req = nfs_list_entry(head->next);

		nfs_list_remove_request(req);

		nfs_list_add_request(req, &data->pages);

		ClearPageError(req->wb_page);

		*pages++ = req->wb_page;

	}

	req = nfs_list_entry(data->pages.next);