projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: Remove proliferation of wait_on_bit() action functions
[deliverable/linux.git]
/
fs
/
nfs
/
pagelist.c
diff --git
a/fs/nfs/pagelist.c
b/fs/nfs/pagelist.c
index b6ee3a6ee96dd2b06df61a022fadc0841da8d0b4..6104d3500b493b84f3f47163ef4a2429dec49873 100644
(file)
--- a/
fs/nfs/pagelist.c
+++ b/
fs/nfs/pagelist.c
@@
-138,12
+138,6
@@
nfs_iocounter_wait(struct nfs_io_counter *c)
return __nfs_iocounter_wait(c);
}
return __nfs_iocounter_wait(c);
}
-static int nfs_wait_bit_uninterruptible(void *word)
-{
- io_schedule();
- return 0;
-}
-
/*
* nfs_page_group_lock - lock the head of the page group
* @req - request in group that is to be locked
/*
* nfs_page_group_lock - lock the head of the page group
* @req - request in group that is to be locked
@@
-158,7
+152,6
@@
nfs_page_group_lock(struct nfs_page *req)
WARN_ON_ONCE(head != head->wb_head);
wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
WARN_ON_ONCE(head != head->wb_head);
wait_on_bit_lock(&head->wb_flags, PG_HEADLOCK,
- nfs_wait_bit_uninterruptible,
TASK_UNINTERRUPTIBLE);
}
TASK_UNINTERRUPTIBLE);
}
@@
-425,9
+418,8
@@
void nfs_release_request(struct nfs_page *req)
int
nfs_wait_on_request(struct nfs_page *req)
{
int
nfs_wait_on_request(struct nfs_page *req)
{
- return wait_on_bit(&req->wb_flags, PG_BUSY,
- nfs_wait_bit_uninterruptible,
- TASK_UNINTERRUPTIBLE);
+ return wait_on_bit_io(&req->wb_flags, PG_BUSY,
+ TASK_UNINTERRUPTIBLE);
}
/*
}
/*
This page took
0.029282 seconds
and
5
git commands to generate.