| 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
| ||
|
Message-Id: <20110718172944.7ffeea475a3da14f421ef527@canb.auug.org.au>
Date: Mon, 18 Jul 2011 17:29:44 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Wu Fengguang <fengguang.wu@...el.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Christoph Hellwig <hch@...radead.org>,
Al Viro <viro@...IV.linux.org.uk>
Subject: linux-next: manual merge of the writeback tree with the vfs tree
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.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
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)
*
--
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/
Powered by blists - more mailing lists