From patchwork Sat Aug 4 13:10:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Fengqi X-Patchwork-Id: 10555755 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 07902157D for ; Sat, 4 Aug 2018 13:11:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAE3B29EE0 for ; Sat, 4 Aug 2018 13:11:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE38029F44; Sat, 4 Aug 2018 13:11:12 +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 89F4329EE0 for ; Sat, 4 Aug 2018 13:11:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728340AbeHDPLv (ORCPT ); Sat, 4 Aug 2018 11:11:51 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:4400 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726871AbeHDPLv (ORCPT ); Sat, 4 Aug 2018 11:11:51 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="43067710" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 04 Aug 2018 21:11:04 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id E84C34B6ADE4 for ; Sat, 4 Aug 2018 21:11:03 +0800 (CST) Received: from fnst.localdomain (10.167.226.155) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.399.0; Sat, 4 Aug 2018 21:11:03 +0800 From: Lu Fengqi To: Subject: [PATCH 0/5] some trivial cleanup about btrfs_delete_subvolume Date: Sat, 4 Aug 2018 21:10:52 +0800 Message-ID: <20180804131057.9967-1-lufq.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-Originating-IP: [10.167.226.155] X-yoursite-MailScanner-ID: E84C34B6ADE4.AF2D3 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: lufq.fnst@cn.fujitsu.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 During I am working on the online undelete of subvolume, I found something in the btrfs_delete_subvolume need to be clean or fix. So, the patchset is mostly about the callee or itself of btrfs_delete_subvolume. Patch 1,3-5 some trivial cleanup Patch 2 fix a problem about qgroup_free_meta_prealloc() in btrfs_subvolume_reserve_metadata() Lu Fengqi (5): btrfs: simplify the send_in_progress check in btrfs_delete_subvolume() btrfs: use a separate variable to store the num_bytes of the qgroup_reserve btrfs: switch update_size to bool in both of btrfs_block_rsv_migrate and btrfs_rsv_add_bytes btrfs: remove a useless return statement in btrfs_block_rsv_add btrfs: Remove root parameter from btrfs_insert_dir_item fs/btrfs/ctree.h | 5 ++--- fs/btrfs/delayed-inode.c | 4 ++-- fs/btrfs/dir-item.c | 8 ++++---- fs/btrfs/extent-tree.c | 36 ++++++++++++++++-------------------- fs/btrfs/file.c | 4 ++-- fs/btrfs/inode.c | 20 +++++++++----------- fs/btrfs/ioctl.c | 3 +-- fs/btrfs/relocation.c | 2 +- fs/btrfs/transaction.c | 7 +++---- 9 files changed, 40 insertions(+), 49 deletions(-)