diff options
Diffstat (limited to 'fs/buffer.c')
-rw-r--r-- | fs/buffer.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index eba6e4f621ce..8f05111bbb8b 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -61,16 +61,9 @@ inline void touch_buffer(struct buffer_head *bh) | |||
61 | } | 61 | } |
62 | EXPORT_SYMBOL(touch_buffer); | 62 | EXPORT_SYMBOL(touch_buffer); |
63 | 63 | ||
64 | static int sleep_on_buffer(void *word) | ||
65 | { | ||
66 | io_schedule(); | ||
67 | return 0; | ||
68 | } | ||
69 | |||
70 | void __lock_buffer(struct buffer_head *bh) | 64 | void __lock_buffer(struct buffer_head *bh) |
71 | { | 65 | { |
72 | wait_on_bit_lock(&bh->b_state, BH_Lock, sleep_on_buffer, | 66 | wait_on_bit_lock_io(&bh->b_state, BH_Lock, TASK_UNINTERRUPTIBLE); |
73 | TASK_UNINTERRUPTIBLE); | ||
74 | } | 67 | } |
75 | EXPORT_SYMBOL(__lock_buffer); | 68 | EXPORT_SYMBOL(__lock_buffer); |
76 | 69 | ||
@@ -123,7 +116,7 @@ EXPORT_SYMBOL(buffer_check_dirty_writeback); | |||
123 | */ | 116 | */ |
124 | void __wait_on_buffer(struct buffer_head * bh) | 117 | void __wait_on_buffer(struct buffer_head * bh) |
125 | { | 118 | { |
126 | wait_on_bit(&bh->b_state, BH_Lock, sleep_on_buffer, TASK_UNINTERRUPTIBLE); | 119 | wait_on_bit_io(&bh->b_state, BH_Lock, TASK_UNINTERRUPTIBLE); |
127 | } | 120 | } |
128 | EXPORT_SYMBOL(__wait_on_buffer); | 121 | EXPORT_SYMBOL(__wait_on_buffer); |
129 | 122 | ||