From patchwork Wed Sep 11 08:52:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 2871441 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 09A0B9F495 for ; Wed, 11 Sep 2013 08:52:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 978EA20254 for ; Wed, 11 Sep 2013 08:52:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17D462026C for ; Wed, 11 Sep 2013 08:52:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752646Ab3IKIwN (ORCPT ); Wed, 11 Sep 2013 04:52:13 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:65155 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751314Ab3IKIv7 (ORCPT ); Wed, 11 Sep 2013 04:51:59 -0400 X-IronPort-AV: E=Sophos;i="4.90,882,1371052800"; d="scan'208";a="8488701" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 11 Sep 2013 16:48:44 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r8B8pqdb019953 for ; Wed, 11 Sep 2013 16:51:53 +0800 Received: from localhost.localdomain ([10.167.226.57]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013091116493241-1414705 ; Wed, 11 Sep 2013 16:49:32 +0800 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: quwenruo@cn.fujitsu.com Subject: [PATCH 6/9] btrfs: Use btrfs_workqueue_struct to replace the fs_info->delalloc_workers Date: Wed, 11 Sep 2013 16:52:35 +0800 Message-Id: <1378889558-21514-7-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1378889558-21514-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1378889558-21514-1-git-send-email-quwenruo@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/11 16:49:32, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/11 16:49:33, Serialize complete at 2013/09/11 16:49:33 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Much like the fs_info->workers, replace the fs_info->delalloc_workers use the same btrfs_workqueue. Signed-off-by: Qu Wenruo --- fs/btrfs/ctree.h | 2 +- fs/btrfs/disk-io.c | 14 +++++--------- fs/btrfs/inode.c | 19 +++++++++---------- fs/btrfs/super.c | 2 +- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 2662ef2..81aba0e 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1477,10 +1477,10 @@ struct btrfs_fs_info { * two */ struct btrfs_workers generic_worker; - struct btrfs_workers delalloc_workers; struct btrfs_workers submit_workers; struct btrfs_workqueue_struct *workers; + struct btrfs_workqueue_struct *delalloc_workers; struct workqueue_struct *flush_workers; struct workqueue_struct *endio_workers; struct workqueue_struct *endio_meta_workers; diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index fb9b760..434e5b3 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1985,7 +1985,7 @@ static noinline int next_root_backup(struct btrfs_fs_info *info, static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info) { btrfs_stop_workers(&fs_info->generic_worker); - btrfs_stop_workers(&fs_info->delalloc_workers); + btrfs_destroy_workqueue(fs_info->delalloc_workers); btrfs_destroy_workqueue(fs_info->workers); btrfs_stop_workers(&fs_info->submit_workers); destroy_workqueue(fs_info->fixup_workers); @@ -2464,9 +2464,9 @@ int open_ctree(struct super_block *sb, fs_info->workers = btrfs_alloc_workqueue("worker", "worker-ordered", "worker-high", max_active); - btrfs_init_workers(&fs_info->delalloc_workers, "delalloc", - fs_info->thread_pool_size, - &fs_info->generic_worker); + fs_info->delalloc_workers = btrfs_alloc_workqueue("delalloc", + "delalloc-ordered", + NULL, max_active); fs_info->flush_workers = alloc_workqueue("flush_delalloc", flags, max_active); @@ -2476,9 +2476,6 @@ int open_ctree(struct super_block *sb, &fs_info->generic_worker); fs_info->caching_workers = alloc_workqueue("cache", flags, 2); - fs_info->delalloc_workers.idle_thresh = 2; - fs_info->delalloc_workers.ordered = 1; - fs_info->fixup_workers = alloc_workqueue("fixup", flags, 1); fs_info->endio_workers = alloc_workqueue("endio", flags, max_active); fs_info->endio_meta_workers = alloc_workqueue("endio-meta", flags, @@ -2503,13 +2500,12 @@ int open_ctree(struct super_block *sb, * return -ENOMEM if any of these fail. */ ret = btrfs_start_workers(&fs_info->generic_worker); - ret |= btrfs_start_workers(&fs_info->delalloc_workers); ret |= btrfs_start_workers(&fs_info->submit_workers); if (ret || !(fs_info->flush_workers && fs_info->endio_workers && fs_info->endio_meta_workers && fs_info->workers && fs_info->endio_raid56_workers && - fs_info->rmw_workers && + fs_info->rmw_workers && fs_info->delalloc_workers && fs_info->endio_meta_write_workers && fs_info->endio_write_workers && fs_info->caching_workers && fs_info->readahead_workers && diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 53901a5..0ae21a6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -59,6 +59,7 @@ #include "inode-map.h" #include "backref.h" #include "hash.h" +#include "bwq.h" struct btrfs_iget_args { u64 ino; @@ -295,7 +296,7 @@ struct async_cow { u64 start; u64 end; struct list_head extents; - struct btrfs_work work; + struct btrfs_work_struct work; }; static noinline int add_async_extent(struct async_cow *cow, @@ -1057,7 +1058,7 @@ static noinline int cow_file_range(struct inode *inode, /* * work queue call back to started compression on a file and pages */ -static noinline void async_cow_start(struct btrfs_work *work) +static noinline void async_cow_start(struct btrfs_work_struct *work) { struct async_cow *async_cow; int num_added = 0; @@ -1075,7 +1076,7 @@ static noinline void async_cow_start(struct btrfs_work *work) /* * work queue call back to submit previously compressed pages */ -static noinline void async_cow_submit(struct btrfs_work *work) +static noinline void async_cow_submit(struct btrfs_work_struct *work) { struct async_cow *async_cow; struct btrfs_root *root; @@ -1096,7 +1097,7 @@ static noinline void async_cow_submit(struct btrfs_work *work) submit_compressed_extents(async_cow->inode, async_cow); } -static noinline void async_cow_free(struct btrfs_work *work) +static noinline void async_cow_free(struct btrfs_work_struct *work) { struct async_cow *async_cow; async_cow = container_of(work, struct async_cow, work); @@ -1133,17 +1134,15 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page, async_cow->end = cur_end; INIT_LIST_HEAD(&async_cow->extents); - async_cow->work.func = async_cow_start; - async_cow->work.ordered_func = async_cow_submit; - async_cow->work.ordered_free = async_cow_free; - async_cow->work.flags = 0; + btrfs_init_work(&async_cow->work, async_cow_start, + async_cow_submit, async_cow_free); nr_pages = (cur_end - start + PAGE_CACHE_SIZE) >> PAGE_CACHE_SHIFT; atomic_add(nr_pages, &root->fs_info->async_delalloc_pages); - btrfs_queue_worker(&root->fs_info->delalloc_workers, - &async_cow->work); + btrfs_queue_work(root->fs_info->delalloc_workers, + &async_cow->work); if (atomic_read(&root->fs_info->async_delalloc_pages) > limit) { wait_event(root->fs_info->async_submit_wait, diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 8fe41f9..771b98a 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1176,7 +1176,7 @@ static void btrfs_resize_thread_pool(struct btrfs_fs_info *fs_info, btrfs_set_max_workers(&fs_info->generic_worker, new_pool_size); btrfs_workqueue_set_max(fs_info->workers, new_pool_size); - btrfs_set_max_workers(&fs_info->delalloc_workers, new_pool_size); + btrfs_workqueue_set_max(fs_info->delalloc_workers, new_pool_size); btrfs_set_max_workers(&fs_info->submit_workers, new_pool_size); workqueue_set_max_active(fs_info->caching_workers, new_pool_size); workqueue_set_max_active(fs_info->fixup_workers, new_pool_size);