From patchwork Thu Apr 26 19:23:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Mahoney X-Patchwork-Id: 10366713 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C9C960547 for ; Thu, 26 Apr 2018 19:24:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5383B28FC6 for ; Thu, 26 Apr 2018 19:24:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EBB42922D; Thu, 26 Apr 2018 19:24:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A459B29218 for ; Thu, 26 Apr 2018 19:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753384AbeDZTX6 (ORCPT ); Thu, 26 Apr 2018 15:23:58 -0400 Received: from mx2.suse.de ([195.135.220.15]:39407 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752991AbeDZTX4 (ORCPT ); Thu, 26 Apr 2018 15:23:56 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3C38BABCC for ; Thu, 26 Apr 2018 19:23:55 +0000 (UTC) Received: from sled4.home.jeffm.io (sled4.home.jeffm.io [192.168.111.8]) by mail.home.jeffm.io (Postfix) with ESMTPS id 5A03681AD3E0; Thu, 26 Apr 2018 15:23:34 -0400 (EDT) Received: by sled4.home.jeffm.io (Postfix, from userid 1000) id 5A1C73F4A; Thu, 26 Apr 2018 15:23:52 -0400 (EDT) From: jeffm@suse.com To: linux-btrfs@vger.kernel.org Cc: Jeff Mahoney Subject: [PATCH 2/3] btrfs: qgroups, remove unnecessary memset before btrfs_init_work Date: Thu, 26 Apr 2018 15:23:50 -0400 Message-Id: <20180426192351.473-2-jeffm@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180426192351.473-1-jeffm@suse.com> References: <20180426192351.473-1-jeffm@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Mahoney btrfs_init_work clears the work struct except for ->wq, so the memset before calling btrfs_init_work in qgroup_rescan_init is unnecessary. We'll also initialize ->wq in btrfs_init_work so that it's obvious. Signed-off-by: Jeff Mahoney Reviewed-by: Nikolay Borisov --- fs/btrfs/async-thread.c | 1 + fs/btrfs/qgroup.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c index d5540749f0e5..c614fb7b9b9d 100644 --- a/fs/btrfs/async-thread.c +++ b/fs/btrfs/async-thread.c @@ -354,6 +354,7 @@ void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t uniq_func, INIT_WORK(&work->normal_work, uniq_func); INIT_LIST_HEAD(&work->ordered_list); work->flags = 0; + work->wq = NULL; } static inline void __btrfs_queue_work(struct __btrfs_workqueue *wq, diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index be491b6c020a..8de423a0c7e3 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -2740,8 +2740,6 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, spin_unlock(&fs_info->qgroup_lock); mutex_unlock(&fs_info->qgroup_rescan_lock); - memset(&fs_info->qgroup_rescan_work, 0, - sizeof(fs_info->qgroup_rescan_work)); btrfs_init_work(&fs_info->qgroup_rescan_work, btrfs_qgroup_rescan_helper, btrfs_qgroup_rescan_worker, NULL, NULL);