summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-12 10:46:03 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-12 10:46:03 +0900
commit40924754f2cabd5d9af4bcd4dcecc362b5e0baa1 (patch)
treefb7c4644acf882f3ac7b0ff6f0972aecd0d77663 /fs
parentcbd8aca472134e666eee87462177f1be854ebbf8 (diff)
parent2f60d628ffd042e65e0b1d3431fb3e38d6f7c1be (diff)
downloadlinux-3.10-40924754f2cabd5d9af4bcd4dcecc362b5e0baa1.tar.gz
linux-3.10-40924754f2cabd5d9af4bcd4dcecc362b5e0baa1.tar.bz2
linux-3.10-40924754f2cabd5d9af4bcd4dcecc362b5e0baa1.zip
Merge branch 'writeback-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Pull writeback fixes from Fengguang Wu: "Three trivial writeback fixes" * 'writeback-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux: CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug writeback: correct comment for move_expired_inodes() backing-dev: use kstrto* in preference to simple_strtoul
Diffstat (limited to 'fs')
-rw-r--r--fs/fs-writeback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 401b6c6248a..51ea267d444 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -249,7 +249,7 @@ static bool inode_dirtied_after(struct inode *inode, unsigned long t)
}
/*
- * Move expired (dirtied after work->older_than_this) dirty inodes from
+ * Move expired (dirtied before work->older_than_this) dirty inodes from
* @delaying_queue to @dispatch_queue.
*/
static int move_expired_inodes(struct list_head *delaying_queue,