forked from luck/tmp_suning_uos_patched
nfs: change nfs_page_group_lock argument
Flip the meaning of the second argument from 'wait' to 'nonblock' to match related functions. Update all five calls to reflect this change. Signed-off-by: Weston Andros Adamson <dros@primarydata.com> Reviewed-by: Peng Tao <tao.peng@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
451fd72219
commit
fd2f3a06d3
@ -139,13 +139,14 @@ nfs_iocounter_wait(struct nfs_io_counter *c)
|
||||
/*
|
||||
* nfs_page_group_lock - lock the head of the page group
|
||||
* @req - request in group that is to be locked
|
||||
* @nonblock - if true don't block waiting for lock
|
||||
*
|
||||
* this lock must be held if modifying the page group list
|
||||
*
|
||||
* returns result from wait_on_bit_lock: 0 on success, < 0 on error
|
||||
*/
|
||||
int
|
||||
nfs_page_group_lock(struct nfs_page *req, bool wait)
|
||||
nfs_page_group_lock(struct nfs_page *req, bool nonblock)
|
||||
{
|
||||
struct nfs_page *head = req->wb_head;
|
||||
int ret;
|
||||
@ -155,7 +156,7 @@ nfs_page_group_lock(struct nfs_page *req, bool wait)
|
||||
do {
|
||||
ret = wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
|
||||
TASK_UNINTERRUPTIBLE);
|
||||
} while (wait && ret != 0);
|
||||
} while (!nonblock && ret != 0);
|
||||
|
||||
WARN_ON_ONCE(ret > 0);
|
||||
return ret;
|
||||
@ -219,7 +220,7 @@ bool nfs_page_group_sync_on_bit(struct nfs_page *req, unsigned int bit)
|
||||
{
|
||||
bool ret;
|
||||
|
||||
nfs_page_group_lock(req, true);
|
||||
nfs_page_group_lock(req, false);
|
||||
ret = nfs_page_group_sync_on_bit_locked(req, bit);
|
||||
nfs_page_group_unlock(req);
|
||||
|
||||
@ -860,7 +861,7 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
|
||||
unsigned int offset, pgbase;
|
||||
int ret;
|
||||
|
||||
ret = nfs_page_group_lock(req, false);
|
||||
ret = nfs_page_group_lock(req, true);
|
||||
if (ret < 0) {
|
||||
desc->pg_error = ret;
|
||||
return 0;
|
||||
@ -886,7 +887,7 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
|
||||
if (desc->pg_recoalesce)
|
||||
return 0;
|
||||
/* retry add_request for this subreq */
|
||||
ret = nfs_page_group_lock(req, false);
|
||||
ret = nfs_page_group_lock(req, true);
|
||||
if (ret < 0) {
|
||||
desc->pg_error = ret;
|
||||
return 0;
|
||||
|
@ -241,7 +241,7 @@ static bool nfs_page_group_covers_page(struct nfs_page *req)
|
||||
unsigned int pos = 0;
|
||||
unsigned int len = nfs_page_length(req->wb_page);
|
||||
|
||||
nfs_page_group_lock(req, true);
|
||||
nfs_page_group_lock(req, false);
|
||||
|
||||
do {
|
||||
tmp = nfs_page_group_search_locked(req->wb_head, pos);
|
||||
@ -479,7 +479,7 @@ nfs_lock_and_join_requests(struct page *page, bool nonblock)
|
||||
}
|
||||
|
||||
/* lock each request in the page group */
|
||||
ret = nfs_page_group_lock(head, false);
|
||||
ret = nfs_page_group_lock(head, true);
|
||||
if (ret < 0)
|
||||
return ERR_PTR(ret);
|
||||
subreq = head;
|
||||
|
Loading…
Reference in New Issue
Block a user