summaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorWeston Andros Adamson <dros@primarydata.com>2014-08-08 11:00:53 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-08-22 18:04:42 -0400
commitfd2f3a06d30c85a17cf035ebc60c88c2a13a8ece (patch)
tree70df5514d2897bc7fb7fd6698acef33860b7b569 /fs/nfs/write.c
parent451fd72219dd6f3355e2d036c598544c760ee532 (diff)
downloadop-kernel-dev-fd2f3a06d30c85a17cf035ebc60c88c2a13a8ece.zip
op-kernel-dev-fd2f3a06d30c85a17cf035ebc60c88c2a13a8ece.tar.gz
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>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index e3b5cf2..2771530 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -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 @@ try_again:
}
/* 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;
OpenPOWER on IntegriCloud