aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-09-23 13:37:09 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-09-25 12:08:25 -0400
commit5b0830cb9085f4b69f9d57d7f3aaff322ffbec26 (patch)
tree10040eb359269d4cd05487790b758144a69e8e39 /fs
parent71fd05a887e0f3f6bfff76ff81b33776177d0606 (diff)
writeback: get rid to incorrect references to pdflush in comments
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/buffer.c10
-rw-r--r--fs/fs-writeback.c5
2 files changed, 6 insertions, 9 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 90a98865b0cc..fc22b4504087 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -274,7 +274,7 @@ void invalidate_bdev(struct block_device *bdev)
274} 274}
275 275
276/* 276/*
277 * Kick pdflush then try to free up some ZONE_NORMAL memory. 277 * Kick the writeback threads then try to free up some ZONE_NORMAL memory.
278 */ 278 */
279static void free_more_memory(void) 279static void free_more_memory(void)
280{ 280{
@@ -1699,9 +1699,9 @@ static int __block_write_full_page(struct inode *inode, struct page *page,
1699 /* 1699 /*
1700 * If it's a fully non-blocking write attempt and we cannot 1700 * If it's a fully non-blocking write attempt and we cannot
1701 * lock the buffer then redirty the page. Note that this can 1701 * lock the buffer then redirty the page. Note that this can
1702 * potentially cause a busy-wait loop from pdflush and kswapd 1702 * potentially cause a busy-wait loop from writeback threads
1703 * activity, but those code paths have their own higher-level 1703 * and kswapd activity, but those code paths have their own
1704 * throttling. 1704 * higher-level throttling.
1705 */ 1705 */
1706 if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) { 1706 if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) {
1707 lock_buffer(bh); 1707 lock_buffer(bh);
@@ -3191,7 +3191,7 @@ void block_sync_page(struct page *page)
3191 * still running obsolete flush daemons, so we terminate them here. 3191 * still running obsolete flush daemons, so we terminate them here.
3192 * 3192 *
3193 * Use of bdflush() is deprecated and will be removed in a future kernel. 3193 * Use of bdflush() is deprecated and will be removed in a future kernel.
3194 * The `pdflush' kernel threads fully replace bdflush daemons and this call. 3194 * The `flush-X' kernel threads fully replace bdflush daemons and this call.
3195 */ 3195 */
3196SYSCALL_DEFINE2(bdflush, int, func, long, data) 3196SYSCALL_DEFINE2(bdflush, int, func, long, data)
3197{ 3197{
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 15e375bf93e6..15944f754e15 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -320,7 +320,7 @@ static bool inode_dirtied_after(struct inode *inode, unsigned long t)
320 * For inodes being constantly redirtied, dirtied_when can get stuck. 320 * For inodes being constantly redirtied, dirtied_when can get stuck.
321 * It _appears_ to be in the future, but is actually in distant past. 321 * It _appears_ to be in the future, but is actually in distant past.
322 * This test is necessary to prevent such wrapped-around relative times 322 * This test is necessary to prevent such wrapped-around relative times
323 * from permanently stopping the whole pdflush writeback. 323 * from permanently stopping the whole bdi writeback.
324 */ 324 */
325 ret = ret && time_before_eq(inode->dirtied_when, jiffies); 325 ret = ret && time_before_eq(inode->dirtied_when, jiffies);
326#endif 326#endif
@@ -1085,9 +1085,6 @@ EXPORT_SYMBOL(__mark_inode_dirty);
1085 * If older_than_this is non-NULL, then only write out inodes which 1085 * If older_than_this is non-NULL, then only write out inodes which
1086 * had their first dirtying at a time earlier than *older_than_this. 1086 * had their first dirtying at a time earlier than *older_than_this.
1087 * 1087 *
1088 * If we're a pdlfush thread, then implement pdflush collision avoidance
1089 * against the entire list.
1090 *
1091 * If `bdi' is non-zero then we're being asked to writeback a specific queue. 1088 * If `bdi' is non-zero then we're being asked to writeback a specific queue.
1092 * This function assumes that the blockdev superblock's inodes are backed by 1089 * This function assumes that the blockdev superblock's inodes are backed by
1093 * a variety of queues, so all inodes are searched. For other superblocks, 1090 * a variety of queues, so all inodes are searched. For other superblocks,