diff options
| author | Weston Andros Adamson <dros@primarydata.com> | 2014-09-15 14:14:36 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 13:41:00 -0700 |
| commit | 609e951309ef5f66f4d1e20a592644efd342d110 (patch) | |
| tree | 326e31c9797428460f6265ada7d9e1b87375c1c5 /include | |
| parent | de4308d1ff92b11b3b5a104884cc4dbdce49a55e (diff) | |
nfs: check wait_on_bit_lock err in page_group_lock
commit e7029206ff43f6cf7d6fcb741adb126f47200516 upstream.
Return errors from wait_on_bit_lock from nfs_page_group_lock.
Add a bool argument @wait to nfs_page_group_lock. If true, loop over
wait_on_bit_lock until it returns cleanly. If false, return the error
from wait_on_bit_lock.
Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index d0fae7b78252..c18c315db126 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -120,7 +120,7 @@ extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc, extern int nfs_wait_on_request(struct nfs_page *); extern void nfs_unlock_request(struct nfs_page *req); extern void nfs_unlock_and_release_request(struct nfs_page *); -extern void nfs_page_group_lock(struct nfs_page *); +extern int nfs_page_group_lock(struct nfs_page *, bool); extern void nfs_page_group_unlock(struct nfs_page *); extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int); |