fs/buffer.c: remove unnecessary init operation after allocating buffer_head.

bh allocation uses kmem_cache_zalloc() so we needn't call
'init_buffer(bh, NULL, NULL)' and perform other set-zero-operations.

Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/buffer.c b/fs/buffer.c
index 71578d69b82dbc6b2d84b53a8bcfc757db234a16..10ef81e10b207aefea70fee5a5a413b23b83a5c5 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -865,8 +865,6 @@ try_again:
 
                /* Link the buffer to its page */
                set_bh_page(bh, page, offset);
-
-               init_buffer(bh, NULL, NULL);
        }
        return head;
 /*

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 81cc7eaff86321c2788c0aa83c236778e6fb4b70..865c4308acb67d64b044a66776e17071d8c6b53f 100644 (file)
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -310,8 +310,6 @@ int journal_write_metadata_buffer(transaction_t *transaction,
 
        new_bh = alloc_buffer_head(GFP_NOFS|__GFP_NOFAIL);
        /* keep subsequent assertions sane */
-       new_bh->b_state = 0;
-       init_buffer(new_bh, NULL, NULL);
        atomic_set(&new_bh->b_count, 1);
        new_jh = journal_add_journal_head(new_bh);      /* This sleeps */
 

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index ed10991ab0060c5fac4ed580301591f6996965ca..8b220f1ab54f337a0c0abef513e5280c7d2966ce 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -367,8 +367,6 @@ retry_alloc:
        }
 
        /* keep subsequent assertions sane */
-       new_bh->b_state = 0;
-       init_buffer(new_bh, NULL, NULL);
        atomic_set(&new_bh->b_count, 1);
        new_jh = jbd2_journal_add_journal_head(new_bh); /* This sleeps */