linux-next: manual merge of the reiserfs-bkl tree with Linus' tree

linux-next: manual merge of the reiserfs-bkl tree with Linus' tree

[Stephen Rothwell]

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;
  }
  

Re: linux-next: manual merge of the reiserfs-bkl tree with Linus' tree

[Frederic Weisbecker]

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.

Re: linux-next: manual merge of the reiserfs-bkl tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 675 bytes --]

Hi Frederic,

On Fri, 31 Jul 2009 07:05:07 +0200 Frederic Weisbecker <fweisbec@gmail.com> wrote:
>
> 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

Thanks.

> 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?

OK, I will fetch the new branch starting on Monday.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]