linux-kernel - linux-next: manual merge of the block tree with the 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20090701153715.7e2935a8.sfr@canb.auug.org.au>
Date:	Wed, 1 Jul 2009 15:37:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <jens.axboe@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Richard Kennedy <richard@....demon.co.uk>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the block tree with the  tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
mm/page-writeback.c between commit
d7831a0bdf06b9f722b947bb0c205ff7d77cebd8 ("mm: prevent balance_dirty_pages
() from doing too much work") from Linus' tree and commit
83f866f06c6d0266330e1631f4644ba6a63e6925 ("writeback: switch to per-bdi
threads for flushing data") from the block tree.

Context changes.  I fixed it up (see below) but am not sure if this is
the correct fix.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc mm/page-writeback.c
index 7687879,7b87d10..0000000
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@@ -541,12 -527,9 +527,12 @@@ static void balance_dirty_pages(struct 
  		 * filesystems (i.e. NFS) in which data may have been
  		 * written to the server's write cache, but has not yet
  		 * been flushed to permanent storage.
 +		 * Only move pages to writeback if this bdi is over its
 +		 * threshold otherwise wait until the disk writes catch
 +		 * up.
  		 */
 -		if (bdi_nr_reclaimable) {
 +		if (bdi_nr_reclaimable > bdi_thresh) {
- 			writeback_inodes(&wbc);
+ 			generic_sync_bdi_inodes(NULL, &wbc);
  			pages_written += write_chunk - wbc.nr_to_write;
  			get_dirty_limits(&background_thresh, &dirty_thresh,
  				       &bdi_thresh, bdi);
--
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/