diff options
Diffstat (limited to 'fs/jbd2')
-rw-r--r-- | fs/jbd2/transaction.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 6f0f590cc5a3..5f09370c90a8 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -763,12 +763,6 @@ static void warn_dirty_buffer(struct buffer_head *bh) | |||
763 | bdevname(bh->b_bdev, b), (unsigned long long)bh->b_blocknr); | 763 | bdevname(bh->b_bdev, b), (unsigned long long)bh->b_blocknr); |
764 | } | 764 | } |
765 | 765 | ||
766 | static int sleep_on_shadow_bh(void *word) | ||
767 | { | ||
768 | io_schedule(); | ||
769 | return 0; | ||
770 | } | ||
771 | |||
772 | /* | 766 | /* |
773 | * If the buffer is already part of the current transaction, then there | 767 | * If the buffer is already part of the current transaction, then there |
774 | * is nothing we need to do. If it is already part of a prior | 768 | * is nothing we need to do. If it is already part of a prior |
@@ -906,8 +900,8 @@ repeat: | |||
906 | if (buffer_shadow(bh)) { | 900 | if (buffer_shadow(bh)) { |
907 | JBUFFER_TRACE(jh, "on shadow: sleep"); | 901 | JBUFFER_TRACE(jh, "on shadow: sleep"); |
908 | jbd_unlock_bh_state(bh); | 902 | jbd_unlock_bh_state(bh); |
909 | wait_on_bit(&bh->b_state, BH_Shadow, | 903 | wait_on_bit_io(&bh->b_state, BH_Shadow, |
910 | sleep_on_shadow_bh, TASK_UNINTERRUPTIBLE); | 904 | TASK_UNINTERRUPTIBLE); |
911 | goto repeat; | 905 | goto repeat; |
912 | } | 906 | } |
913 | 907 | ||