Message ID | 1365456754-29373-9-git-send-email-jack@suse.cz |
---|---|
State | Superseded, archived |
Headers | show |
On Mon, Apr 08, 2013 at 11:32:13PM +0200, Jan Kara wrote: > The comment about credit estimates isn't true anymore. We do what the > comment describes now. > > Signed-off-by: Jan Kara <jack@suse.cz> Reviewed-by: Zheng Liu <wenqing.lz@taobao.com> Regards, - Zheng > --- > fs/jbd2/transaction.c | 10 ---------- > 1 files changed, 0 insertions(+), 10 deletions(-) > > diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c > index 81df09c..74cfbd3 100644 > --- a/fs/jbd2/transaction.c > +++ b/fs/jbd2/transaction.c > @@ -283,16 +283,6 @@ repeat: > * reduce the free space arbitrarily. Be careful to account for > * those buffers when checkpointing. > */ > - > - /* > - * @@@ AKPM: This seems rather over-defensive. We're giving commit > - * a _lot_ of headroom: 1/4 of the journal plus the size of > - * the committing transaction. Really, we only need to give it > - * committing_transaction->t_outstanding_credits plus "enough" for > - * the log control blocks. > - * Also, this test is inconsistent with the matching one in > - * jbd2_journal_extend(). > - */ > if (__jbd2_log_space_left(journal) < jbd_space_needed(journal)) { > jbd_debug(2, "Handle %p waiting for checkpoint...\n", handle); > atomic_sub(nblocks, &transaction->t_outstanding_credits); > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 81df09c..74cfbd3 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -283,16 +283,6 @@ repeat: * reduce the free space arbitrarily. Be careful to account for * those buffers when checkpointing. */ - - /* - * @@@ AKPM: This seems rather over-defensive. We're giving commit - * a _lot_ of headroom: 1/4 of the journal plus the size of - * the committing transaction. Really, we only need to give it - * committing_transaction->t_outstanding_credits plus "enough" for - * the log control blocks. - * Also, this test is inconsistent with the matching one in - * jbd2_journal_extend(). - */ if (__jbd2_log_space_left(journal) < jbd_space_needed(journal)) { jbd_debug(2, "Handle %p waiting for checkpoint...\n", handle); atomic_sub(nblocks, &transaction->t_outstanding_credits);
The comment about credit estimates isn't true anymore. We do what the comment describes now. Signed-off-by: Jan Kara <jack@suse.cz> --- fs/jbd2/transaction.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-)