diff --git a/[refs] b/[refs] index 2024182589f7..68c72f9eb5b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d394e122bc1adba0f3eb1ebec1cedb8a8c524741 +refs/heads/master: 7ddae86095794cce4364740edd8463c77654a265 diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c index c051a94c8a97..3a8700153cb0 100644 --- a/trunk/fs/jbd2/transaction.c +++ b/trunk/fs/jbd2/transaction.c @@ -27,6 +27,8 @@ #include #include +static void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh); + /* * jbd2_get_transaction: obtain a new transaction_t object. * diff --git a/trunk/include/linux/jbd2.h b/trunk/include/linux/jbd2.h index 98a0ae52660f..0e0fedd2039a 100644 --- a/trunk/include/linux/jbd2.h +++ b/trunk/include/linux/jbd2.h @@ -848,7 +848,6 @@ struct journal_s */ /* Filing buffers */ -extern void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh); extern void jbd2_journal_unfile_buffer(journal_t *, struct journal_head *); extern void __jbd2_journal_unfile_buffer(struct journal_head *); extern void __jbd2_journal_refile_buffer(struct journal_head *);