From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753798AbZGMBv2 (ORCPT ); Sun, 12 Jul 2009 21:51:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753077AbZGMBvT (ORCPT ); Sun, 12 Jul 2009 21:51:19 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:41994 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237AbZGMBvS (ORCPT ); Sun, 12 Jul 2009 21:51:18 -0400 Date: Mon, 13 Jul 2009 11:51:14 +1000 From: Stephen Rothwell To: =?UTF-8?B?IkZyw6lkw6lyaWMgV2Vpc2JlY2tlciI=?= Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe Subject: linux-next: manual merge of the reiserfs-bkl tree with Linus' tree Message-Id: <20090713115114.a871ea68.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; }