From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Qian Cai <cai@lca•pw>, Jan Kara <jack@suse•cz>,
Linus <torvalds@linux-foundation•org>
Subject: Re: linux-next: manual merge of the tip tree with the ext4 tree
Date: Thu, 28 Nov 2019 10:57:05 +1100 [thread overview]
Message-ID: <20191128105705.5ca58991@canb.auug.org.au> (raw)
In-Reply-To: <20191107132138.67da101f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 3141 bytes --]
Hi all,
On Thu, 7 Nov 2019 13:21:38 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> fs/jbd2/transaction.c
>
> between commit:
>
> ec8b6f600e49 ("jbd2: Factor out common parts of stopping and restarting a handle")
>
> from the ext4 tree and commit:
>
> 5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/jbd2/transaction.c
> index c068912408dd,b25ebdcabfa3..000000000000
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@@ -690,49 -655,6 +690,49 @@@ error_out
> return result;
> }
>
> +static void stop_this_handle(handle_t *handle)
> +{
> + transaction_t *transaction = handle->h_transaction;
> + journal_t *journal = transaction->t_journal;
> + int revokes;
> +
> + J_ASSERT(journal_current_handle() == handle);
> + J_ASSERT(atomic_read(&transaction->t_updates) > 0);
> + current->journal_info = NULL;
> + /*
> + * Subtract necessary revoke descriptor blocks from handle credits. We
> + * take care to account only for revoke descriptor blocks the
> + * transaction will really need as large sequences of transactions with
> + * small numbers of revokes are relatively common.
> + */
> + revokes = handle->h_revoke_credits_requested - handle->h_revoke_credits;
> + if (revokes) {
> + int t_revokes, revoke_descriptors;
> + int rr_per_blk = journal->j_revoke_records_per_block;
> +
> + WARN_ON_ONCE(DIV_ROUND_UP(revokes, rr_per_blk)
> + > handle->h_total_credits);
> + t_revokes = atomic_add_return(revokes,
> + &transaction->t_outstanding_revokes);
> + revoke_descriptors =
> + DIV_ROUND_UP(t_revokes, rr_per_blk) -
> + DIV_ROUND_UP(t_revokes - revokes, rr_per_blk);
> + handle->h_total_credits -= revoke_descriptors;
> + }
> + atomic_sub(handle->h_total_credits,
> + &transaction->t_outstanding_credits);
> + if (handle->h_rsv_handle)
> + __jbd2_journal_unreserve_handle(handle->h_rsv_handle);
> + if (atomic_dec_and_test(&transaction->t_updates))
> + wake_up(&journal->j_wait_updates);
> +
> - rwsem_release(&journal->j_trans_commit_map, 1, _THIS_IP_);
> ++ rwsem_release(&journal->j_trans_commit_map, _THIS_IP_);
> + /*
> + * Scope of the GFP_NOFS context is over here and so we can restore the
> + * original alloc context.
> + */
> + memalloc_nofs_restore(handle->saved_alloc_context);
> +}
>
> /**
> * int jbd2_journal_restart() - restart a handle .
This is now a conflict between the ext4 tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-11-27 23:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 2:21 linux-next: manual merge of the tip tree with the ext4 tree Stephen Rothwell
2019-11-27 23:57 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191128105705.5ca58991@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cai@lca$(echo .)pw \
--cc=hpa@zytor$(echo .)com \
--cc=jack@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox