From: Weston Andros Adamson Date: Fri, 11 Jul 2014 14:20:48 +0000 (-0400) Subject: nfs: handle multiple reqs in nfs_page_async_flush X-Git-Tag: cleanup-for-v3.18~220^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d458138353726ea6dcbc53ae3597e489d0432c25;p=pandora-kernel.git nfs: handle multiple reqs in nfs_page_async_flush Change nfs_find_and_lock_request so nfs_page_async_flush can handle multiple requests in a page. There is only one request for a page the first time nfs_page_async_flush is called, but if a write or commit fails, async_flush is called again and there may be multiple requests associated with the page. The solution is to merge all the requests in a page group into a single request before calling nfs_pageio_add_request. Rename nfs_find_and_lock_request to nfs_lock_and_join_requests and change it to first lock all requests for the page, then cancel and merge all subrequests into the head request. Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust --- Reading git-diff-tree failed