diff options
Diffstat (limited to 'fs/nfs/pagelist.c')
-rw-r--r-- | fs/nfs/pagelist.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index b6ee3a6ee96d..6104d3500b49 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -138,12 +138,6 @@ nfs_iocounter_wait(struct nfs_io_counter *c) | |||
138 | return __nfs_iocounter_wait(c); | 138 | return __nfs_iocounter_wait(c); |
139 | } | 139 | } |
140 | 140 | ||
141 | static int nfs_wait_bit_uninterruptible(void *word) | ||
142 | { | ||
143 | io_schedule(); | ||
144 | return 0; | ||
145 | } | ||
146 | |||
147 | /* | 141 | /* |
148 | * nfs_page_group_lock - lock the head of the page group | 142 | * nfs_page_group_lock - lock the head of the page group |
149 | * @req - request in group that is to be locked | 143 | * @req - request in group that is to be locked |
@@ -158,7 +152,6 @@ nfs_page_group_lock(struct nfs_page *req) | |||
158 | WARN_ON_ONCE(head != head->wb_head); | 152 | WARN_ON_ONCE(head != head->wb_head); |
159 | 153 | ||
160 | wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK, | 154 | wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK, |
161 | nfs_wait_bit_uninterruptible, | ||
162 | TASK_UNINTERRUPTIBLE); | 155 | TASK_UNINTERRUPTIBLE); |
163 | } | 156 | } |
164 | 157 | ||
@@ -425,9 +418,8 @@ void nfs_release_request(struct nfs_page *req) | |||
425 | int | 418 | int |
426 | nfs_wait_on_request(struct nfs_page *req) | 419 | nfs_wait_on_request(struct nfs_page *req) |
427 | { | 420 | { |
428 | return wait_on_bit(&req->wb_flags, PG_BUSY, | 421 | return wait_on_bit_io(&req->wb_flags, PG_BUSY, |
429 | nfs_wait_bit_uninterruptible, | 422 | TASK_UNINTERRUPTIBLE); |
430 | TASK_UNINTERRUPTIBLE); | ||
431 | } | 423 | } |
432 | 424 | ||
433 | /* | 425 | /* |