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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 13 Jul 2009 11:51:14 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Frédéric Weisbecker" <fweisbec@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jens Axboe <jens.axboe@...cle.com>
Subject: linux-next: manual merge of the reiserfs-bkl tree with Linus' tree

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@...b.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;
  }
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/