From 1928aa92b1797e94870e99e4663937e1695e75c6 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 25 Jul 2012 18:12:06 +0300 Subject: [PATCH] --- yaml --- r: 321395 b: refs/heads/master c: b257031408945eb89980e14cb79d5fd854d8f25f h: refs/heads/master i: 321393: c54017bd93056d38b9d74941c6edaeb27ae20191 321391: ef7bb4a1a32c9f8cb1e1993c3f5f13e01bca8fe9 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 3 ++- trunk/fs/btrfs/ordered-data.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 25303cfa485d..78bb40a05403 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34eaadaf22b0dd453288c6b115e0c823a0fb74d5 +refs/heads/master: b257031408945eb89980e14cb79d5fd854d8f25f diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 83baec24946d..6e8f416773d4 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -324,7 +324,8 @@ static noinline int add_async_extent(struct async_cow *cow, * If this code finds it can't get good compression, it puts an * entry onto the work queue to write the uncompressed bytes. This * makes sure that both compressed inodes and uncompressed inodes - * are written in the same order that pdflush sent them down. + * are written in the same order that the flusher thread sent them + * down. */ static noinline int compress_file_range(struct inode *inode, struct page *locked_page, diff --git a/trunk/fs/btrfs/ordered-data.c b/trunk/fs/btrfs/ordered-data.c index 643335a4fe3c..051c7fe551dd 100644 --- a/trunk/fs/btrfs/ordered-data.c +++ b/trunk/fs/btrfs/ordered-data.c @@ -596,7 +596,7 @@ void btrfs_start_ordered_extent(struct inode *inode, /* * pages in the range can be dirty, clean or writeback. We * start IO on any dirty ones so the wait doesn't stall waiting - * for pdflush to find them + * for the flusher thread to find them */ if (!test_bit(BTRFS_ORDERED_DIRECT, &entry->flags)) filemap_fdatawrite_range(inode->i_mapping, start, end);