linux-kernel - linux-next: manual merge of the tmem tree with the vfs 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>] [day] [month] [year] [list]

Date:	Wed, 28 Dec 2011 18:07:24 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dan Magenheimer <dan.magenheimer@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
	Al Viro <viro@...iv.linux.org.uk>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Nick Piggin <npiggin@...e.de>
Subject: linux-next: manual merge of the tmem tree with the vfs tree

Hi Dan,

Today's linux-next merge of the tmem tree got a conflict in fs/buffer.c
between commit b1cdabb05024 ("fs: move code out of buffer.c") from the
vfs tree and commit 294a90bcfd28 ("mm: cleancache: s/flush/invalidate/")
from the tmem tree.

The code that was modified by the latter was moved by the former.  I
applied the following merge fixup patch.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 28 Dec 2011 18:05:28 +1100
Subject: [PATCH] tmem: fix up for code movement

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 fs/block_dev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 69a5b6f..d6d5f29 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -110,7 +110,7 @@ void invalidate_bdev(struct block_device *bdev)
 	/* 99% of the time, we don't need to flush the cleancache on the bdev.
 	 * But, for the strange corners, lets be cautious
 	 */
-	cleancache_flush_inode(mapping);
+	cleancache_invalidate_inode(mapping);
 }
 EXPORT_SYMBOL(invalidate_bdev);
 
-- 
1.7.8.197.g73c6b

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped