From: Wu Fengguang <fengguang.wu@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@infradead.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: Re: linux-next: manual merge of the writeback tree with the vfs tree
Date: Sat, 23 Jul 2011 22:43:46 +0800 [thread overview]
Message-ID: <20110723144346.GA5946@localhost> (raw)
In-Reply-To: <20110718172944.7ffeea475a3da14f421ef527@canb.auug.org.au>
Hi Stephen,
On Mon, Jul 18, 2011 at 03:29:44PM +0800, Stephen Rothwell wrote:
> Hi Wu,
>
> Today's linux-next merge of the writeback tree got a conflict in
> mm/filemap.c between commit ba96a361e21b ("fs: kill i_alloc_sem") from
> the vfs tree and commit f758eeabeb96 ("writeback: split
> inode_wb_list_lock into bdi_writeback.list_lock") from the writeback tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
OK, thank you very much!
Cheers,
Fengguang
> diff --cc mm/filemap.c
> index f820e60,1e492c3..0000000
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@@ -78,7 -78,10 +78,7 @@@
> * ->i_mutex (generic_file_buffered_write)
> * ->mmap_sem (fault_in_pages_readable->do_page_fault)
> *
> - * inode_wb_list_lock
> - * ->i_mutex
> - * ->i_alloc_sem (various)
> - *
> + * bdi->wb.list_lock
> * sb_lock (fs/fs-writeback.c)
> * ->mapping->tree_lock (__sync_single_inode)
> *
next prev parent reply other threads:[~2011-07-23 14:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 7:29 linux-next: manual merge of the writeback tree with the vfs tree Stephen Rothwell
2011-07-23 14:43 ` Wu Fengguang [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-07-18 7:34 Stephen Rothwell
2011-07-23 14:44 ` Wu Fengguang
2011-07-26 4:58 ` Wu Fengguang
2011-07-26 5:14 ` Stephen Rothwell
2011-07-26 5:23 ` Wu Fengguang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110723144346.GA5946@localhost \
--to=fengguang.wu@intel.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).