evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfs: handle multiple reqs in nfs_wb_page_cancel

Browse source 
Use nfs_lock_and_join_requests to merge all subrequests into the head request -
this cancels and dereferences all subrequests.

Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Weston Andros Adamson 2014-07-11 10:20:49 -04:00 • committed by Trond Myklebust
parent d458138353
commit 3e2170451e
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
fs/nfs/write.c
View file

@ -1799,27 +1799,28 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page)
struct nfs_page *req; struct nfs_page *req;
int ret = 0; int ret = 0;
for (;;) { wait_on_page_writeback(page);
wait_on_page_writeback(page);
req = nfs_page_find_head_request(page); /* blocking call to cancel all requests and join to a single (head)
if (req == NULL) * request */
break; req = nfs_lock_and_join_requests(page, false);
if (nfs_lock_request(req)) {
nfs_clear_request_commit(req); if (IS_ERR(req)) {
nfs_inode_remove_request(req); ret = PTR_ERR(req);
/* } else if (req) {
* In case nfs_inode_remove_request has marked the /* all requests from this page have been cancelled by
* page as being dirty * nfs_lock_and_join_requests, so just remove the head
*/ * request from the inode / page_private pointer and
cancel_dirty_page(page, PAGE_CACHE_SIZE); * release it */
nfs_unlock_and_release_request(req); nfs_inode_remove_request(req);
break; /*
} * In case nfs_inode_remove_request has marked the
ret = nfs_wait_on_request(req); * page as being dirty
nfs_release_request(req); */
if (ret < 0) cancel_dirty_page(page, PAGE_CACHE_SIZE);
break; nfs_unlock_and_release_request(req);
} }
return ret; return ret;
} }