From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932596Ab2AMRqH (ORCPT ); Fri, 13 Jan 2012 12:46:07 -0500 Received: from rcsinet15.oracle.com ([148.87.113.117]:53411 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932220Ab2AMRqD (ORCPT ); Fri, 13 Jan 2012 12:46:03 -0500 Date: Fri, 13 Jan 2012 12:43:06 -0500 From: Konrad Rzeszutek Wilk To: Seth Jennings Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, Dan Magenheimer , Kamezawa Hiroyuki , Jan Beulich , Jeremy Fitzhardinge , Hugh Dickins , Johannes Weiner , Nitin Gupta , Matthew Wilcox , Chris Mason , Rik Riel Subject: Re: [PATCH 1/4] mm: cleancache: s/flush/invalidate/ Message-ID: <20120113174306.GB16182@phenom.dumpdata.com> References: <1326400580-16853-1-git-send-email-konrad.wilk@oracle.com> <1326400580-16853-2-git-send-email-konrad.wilk@oracle.com> <4F104AD1.2080607@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4F104AD1.2080607@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] X-CT-RefId: str=0001.0A090209.4F106DA4.007E,ss=1,re=0.000,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 13, 2012 at 09:16:33AM -0600, Seth Jennings wrote: > Hey Konrad, > > On 01/12/2012 02:36 PM, Konrad Rzeszutek Wilk wrote: > > From: Dan Magenheimer > > > > Per akpm suggestions alter the use of the term flush to be > > invalidate. The next patch will do this across all MM. > > > > This change is completely cosmetic. > > > > [v9: akpm@linux-foundation.org: change "flush" to "invalidate", part 3] > > > > Signed-off-by: Dan Magenheimer > > Reviewed-by: Konrad Wilk > > Cc: Kamezawa Hiroyuki > > Cc: Jan Beulich > > Cc: Seth Jennings > > Cc: Jeremy Fitzhardinge > > Cc: Hugh Dickins > > Cc: Johannes Weiner > > Cc: Nitin Gupta > > Cc: Matthew Wilcox > > Cc: Chris Mason > > Cc: Rik Riel > > Cc: Andrew Morton > > [v10: Fixed fs: move code out of buffer.c conflict change] > > Signed-off-by: Konrad Rzeszutek Wilk > > --- > > Documentation/vm/cleancache.txt | 37 +++++++++++++++++++------------------ > > fs/block_dev.c | 2 +- > > fs/super.c | 2 +- > > include/linux/cleancache.h | 23 ++++++++++++++--------- > > mm/cleancache.c | 19 ++++++++++--------- > > mm/filemap.c | 2 +- > > mm/truncate.c | 10 +++++----- > > 7 files changed, 51 insertions(+), 44 deletions(-) > snip > > 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); > > This hunk doesn't merge cleanly because there is no existing > cleancache code in fs/block_dev.c in v3.2 or any previous version. Hm, I am at 099469502f62fbe0d7e4f0b83a2f22538367f734 and I see that file with "cleancache_flush_inode" ? This is against v3.3-rc0, not 3.2. > > Looking at the git log, doesn't look like any cleancache code was > ever merged into this file. It was merged in buffer.c and invalidate_bdev got moved to fs/block_dev.c