Merge branch 'for-3.1/core' of git://git.kernel.dk/linux-block

[mirror_ubuntu-artful-kernel.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index a8251a8d3457d28802164d6538c9226e98416f73..f820e600f1adb5c13456936dda0ba89d759e16db 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -78,9 +78,6 @@
  *  ->i_mutex                  (generic_file_buffered_write)
  *    ->mmap_sem               (fault_in_pages_readable->do_page_fault)
  *
- *  ->i_mutex
- *    ->i_alloc_sem             (various)
- *
  *  inode_wb_list_lock
  *    sb_lock                  (fs/fs-writeback.c)
  *    ->mapping->tree_lock     (__sync_single_inode)