Re: linux-next: manual merge of the writeback tree with the vfs tree
From: Wu Fengguang <hidden>
Date: 2011-07-23 14:43:54
Also in:
lkml
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
quoted hunk ↗ jump to hunk
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) *