diff options
| -rw-r--r-- | fs/nfs/pagelist.c | 21 | ||||
| -rw-r--r-- | include/linux/nfs_page.h | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index a6f2bbd..ced7974 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -166,27 +166,6 @@ nfs_page_group_lock(struct nfs_page *req, bool nonblock) } /* - * nfs_page_group_lock_wait - wait for the lock to clear, but don't grab it - * @req - a request in the group - * - * This is a blocking call to wait for the group lock to be cleared. - */ -void -nfs_page_group_lock_wait(struct nfs_page *req) -{ - struct nfs_page *head = req->wb_head; - - WARN_ON_ONCE(head != head->wb_head); - - if (!test_bit(PG_HEADLOCK, &head->wb_flags)) - return; - set_bit(PG_CONTENDED1, &head->wb_flags); - smp_mb__after_atomic(); - wait_on_bit(&head->wb_flags, PG_HEADLOCK, - TASK_UNINTERRUPTIBLE); -} - -/* * nfs_page_group_unlock - unlock the head of the page group * @req - request in group that is to be unlocked */ diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index d67b67a..de1d24c 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -140,7 +140,6 @@ 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 int nfs_page_group_lock(struct nfs_page *, bool); -extern void nfs_page_group_lock_wait(struct nfs_page *); extern void nfs_page_group_unlock(struct nfs_page *); extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int); extern bool nfs_async_iocounter_wait(struct rpc_task *, struct nfs_lock_context *); |
