diff options
| -rw-r--r-- | fs/buffer.c | 2 | ||||
| -rw-r--r-- | fs/jbd/journal.c | 2 | ||||
| -rw-r--r-- | fs/jbd2/journal.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 71578d69b82d..10ef81e10b20 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -865,8 +865,6 @@ try_again: | |||
| 865 | 865 | ||
| 866 | /* Link the buffer to its page */ | 866 | /* Link the buffer to its page */ |
| 867 | set_bh_page(bh, page, offset); | 867 | set_bh_page(bh, page, offset); |
| 868 | |||
| 869 | init_buffer(bh, NULL, NULL); | ||
| 870 | } | 868 | } |
| 871 | return head; | 869 | return head; |
| 872 | /* | 870 | /* |
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 81cc7eaff863..865c4308acb6 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
| @@ -310,8 +310,6 @@ int journal_write_metadata_buffer(transaction_t *transaction, | |||
| 310 | 310 | ||
| 311 | new_bh = alloc_buffer_head(GFP_NOFS|__GFP_NOFAIL); | 311 | new_bh = alloc_buffer_head(GFP_NOFS|__GFP_NOFAIL); |
| 312 | /* keep subsequent assertions sane */ | 312 | /* keep subsequent assertions sane */ |
| 313 | new_bh->b_state = 0; | ||
| 314 | init_buffer(new_bh, NULL, NULL); | ||
| 315 | atomic_set(&new_bh->b_count, 1); | 313 | atomic_set(&new_bh->b_count, 1); |
| 316 | new_jh = journal_add_journal_head(new_bh); /* This sleeps */ | 314 | new_jh = journal_add_journal_head(new_bh); /* This sleeps */ |
| 317 | 315 | ||
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index ed10991ab006..8b220f1ab54f 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c | |||
| @@ -367,8 +367,6 @@ retry_alloc: | |||
| 367 | } | 367 | } |
| 368 | 368 | ||
| 369 | /* keep subsequent assertions sane */ | 369 | /* keep subsequent assertions sane */ |
| 370 | new_bh->b_state = 0; | ||
| 371 | init_buffer(new_bh, NULL, NULL); | ||
| 372 | atomic_set(&new_bh->b_count, 1); | 370 | atomic_set(&new_bh->b_count, 1); |
| 373 | new_jh = jbd2_journal_add_journal_head(new_bh); /* This sleeps */ | 371 | new_jh = jbd2_journal_add_journal_head(new_bh); /* This sleeps */ |
| 374 | 372 | ||
