From: Frederic Weisbecker <fweisbec@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jens Axboe <jens.axboe@oracle•com>
Subject: Re: linux-next: manual merge of the reiserfs-bkl tree with Linus' tree
Date: Fri, 31 Jul 2009 07:05:07 +0200 [thread overview]
Message-ID: <20090731050505.GA6115@nowhere> (raw)
In-Reply-To: <20090713115114.a871ea68.sfr@canb.auug.org.au>
On Mon, Jul 13, 2009 at 11:51:14AM +1000, Stephen Rothwell wrote:
> Hi Frédéric,
>
> Today's linux-next merge of the reiserfs-bkl tree got a conflict in
> fs/reiserfs/journal.c between commit
> 8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0 ("Fix congestion_wait()
> sync/async vs read/write confusion") from Linus' tree and commit
> e533d8da923c77ed58940309c401584bffda75e0 ("reiserfs: kill-the-BKL") from
> the reiserfs-bkl tree.
>
> Just context changes. I fixed it up as best I could (see below) and can
> carry the fix for a while.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc fs/reiserfs/journal.c
> index 9062220,86c1ff4..0000000
> --- a/fs/reiserfs/journal.c
> +++ b/fs/reiserfs/journal.c
> @@@ -996,8 -984,13 +984,13 @@@ static int reiserfs_async_progress_wait
> {
> DEFINE_WAIT(wait);
> struct reiserfs_journal *j = SB_JOURNAL(s);
> - if (atomic_read(&j->j_async_throttle))
> +
> + if (atomic_read(&j->j_async_throttle)) {
> + reiserfs_write_unlock(s);
> - congestion_wait(WRITE, HZ / 10);
> + congestion_wait(BLK_RW_ASYNC, HZ / 10);
> + reiserfs_write_lock(s);
> + }
> +
> return 0;
> }
>
Sorry to answer that late. That's the right fix, thanks Stephen!
I've pushed the latest update/rebase of the reiserfs/kill-bkl tree
there:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git \
reiserfs/kill-bkl
I've changed the branch name because the previous one had a fixed rc version
inside. This new branch will keep beeing the most up to date.
Could you please drop the old branch and integrate this new one?
Thanks a lot,
Frederic.
next prev parent reply other threads:[~2009-07-31 5:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-13 1:51 linux-next: manual merge of the reiserfs-bkl tree with Linus' tree Stephen Rothwell
2009-07-31 5:05 ` Frederic Weisbecker [this message]
2009-07-31 5:50 ` Stephen Rothwell
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=20090731050505.GA6115@nowhere \
--to=fweisbec@gmail$(echo .)com \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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