Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

writeback: get rid to incorrect references to pdflush in comments

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

+17 -19
+5 -5
fs/buffer.c
··· 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 */ 279 279 static void free_more_memory(void) 280 280 { ··· 1699 1699 /* 1700 1700 * If it's a fully non-blocking write attempt and we cannot 1701 1701 * lock the buffer then redirty the page. Note that this can 1702 - * potentially cause a busy-wait loop from pdflush and kswapd 1703 - * activity, but those code paths have their own higher-level 1704 - * throttling. 1702 + * potentially cause a busy-wait loop from writeback threads 1703 + * and kswapd activity, but those code paths have their own 1704 + * higher-level throttling. 1705 1705 */ 1706 1706 if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) { 1707 1707 lock_buffer(bh); ··· 3191 3191 * still running obsolete flush daemons, so we terminate them here. 3192 3192 * 3193 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 */ 3196 3196 SYSCALL_DEFINE2(bdflush, int, func, long, data) 3197 3197 {
+1 -4
fs/fs-writeback.c
··· 320 320 * For inodes being constantly redirtied, dirtied_when can get stuck. 321 321 * It _appears_ to be in the future, but is actually in distant past. 322 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 325 ret = ret && time_before_eq(inode->dirtied_when, jiffies); 326 326 #endif ··· 1084 1084 * 1085 1085 * If older_than_this is non-NULL, then only write out inodes which 1086 1086 * had their first dirtying at a time earlier than *older_than_this. 1087 - * 1088 - * If we're a pdlfush thread, then implement pdflush collision avoidance 1089 - * against the entire list. 1090 1087 * 1091 1088 * If `bdi' is non-zero then we're being asked to writeback a specific queue. 1092 1089 * This function assumes that the blockdev superblock's inodes are backed by
+4 -4
mm/page-writeback.c
··· 58 58 /* The following parameters are exported via /proc/sys/vm */ 59 59 60 60 /* 61 - * Start background writeback (via pdflush) at this percentage 61 + * Start background writeback (via writeback threads) at this percentage 62 62 */ 63 63 int dirty_background_ratio = 10; 64 64 ··· 477 477 * balance_dirty_pages() must be called by processes which are generating dirty 478 478 * data. It looks at the number of dirty pages in the machine and will force 479 479 * the caller to perform writeback if the system is over `vm_dirty_ratio'. 480 - * If we're over `background_thresh' then pdflush is woken to perform some 481 - * writeout. 480 + * If we're over `background_thresh' then the writeback threads are woken to 481 + * perform some writeout. 482 482 */ 483 483 static void balance_dirty_pages(struct address_space *mapping, 484 484 unsigned long write_chunk) ··· 582 582 bdi->dirty_exceeded = 0; 583 583 584 584 if (writeback_in_progress(bdi)) 585 - return; /* pdflush is already working this queue */ 585 + return; 586 586 587 587 /* 588 588 * In laptop mode, we wait until hitting the higher threshold before
+3 -2
mm/shmem.c
··· 1046 1046 * sync from ever calling shmem_writepage; but a stacking filesystem 1047 1047 * may use the ->writepage of its underlying filesystem, in which case 1048 1048 * tmpfs should write out to swap only in response to memory pressure, 1049 - * and not for pdflush or sync. However, in those cases, we do still 1050 - * want to check if there's a redundant swappage to be discarded. 1049 + * and not for the writeback threads or sync. However, in those cases, 1050 + * we do still want to check if there's a redundant swappage to be 1051 + * discarded. 1051 1052 */ 1052 1053 if (wbc->for_reclaim) 1053 1054 swap = get_swap_page();
+4 -4
mm/vmscan.c
··· 1709 1709 * 1710 1710 * If the caller is !__GFP_FS then the probability of a failure is reasonably 1711 1711 * high - the zone may be full of dirty or under-writeback pages, which this 1712 - * caller can't do much about. We kick pdflush and take explicit naps in the 1713 - * hope that some of these pages can be written. But if the allocating task 1714 - * holds filesystem locks which prevent writeout this might not work, and the 1715 - * allocation attempt will fail. 1712 + * caller can't do much about. We kick the writeback threads and take explicit 1713 + * naps in the hope that some of these pages can be written. But if the 1714 + * allocating task holds filesystem locks which prevent writeout this might not 1715 + * work, and the allocation attempt will fail. 1716 1716 * 1717 1717 * returns: 0, if no pages reclaimed 1718 1718 * else, the number of pages reclaimed