---

yaml --- r: 321397 b: refs/heads/master c: 0d5c3eb h: refs/heads/master i: 321395: 1928aa9 v: v3
git-mirror · Aug 4, 2012 · 7b8758f · 7b8758f
1 parent bee6cba
commit 7b8758f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12810ad70858af10f5e00b3c178085c03baa457b
+refs/heads/master: 0d5c3eba2e1e5aa74e097f49bc90b58f607e101c
diff --git a/trunk/fs/bio.c b/trunk/fs/bio.c
@@ -1312,7 +1312,7 @@ EXPORT_SYMBOL(bio_copy_kern);
  * Note that this code is very hard to test under normal circumstances because
  * direct-io pins the pages with get_user_pages().  This makes
  * is_page_cache_freeable return false, and the VM will not clean the pages.
- * But other code (eg, pdflush) could clean the pages if they are mapped
+ * But other code (eg, flusher threads) could clean the pages if they are mapped
  * pagecache.
  *
  * Simply disabling the call to bio_set_pages_dirty() is a good way to test the

diff --git a/trunk/include/linux/writeback.h b/trunk/include/linux/writeback.h
@@ -104,7 +104,6 @@ static inline void wait_on_inode(struct inode *inode)
 	wait_on_bit(&inode->i_state, __I_NEW, inode_wait, TASK_UNINTERRUPTIBLE);
 }
 
-
 /*
  * mm/page-writeback.c
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,7 +104,6 @@ static inline void wait_on_inode(struct inode *inode) @@
     	wait_on_bit(&inode->i_state, __I_NEW, inode_wait, TASK_UNINTERRUPTIBLE);
     }
     /*
      * mm/page-writeback.c
      */
@@ Expand Down @@