From patchwork Sat Nov 2 15:14:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 3130731 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 32EE3BEEB2 for ; Sat, 2 Nov 2013 15:15:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32B5520375 for ; Sat, 2 Nov 2013 15:15:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F5BD20357 for ; Sat, 2 Nov 2013 15:15:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753255Ab3KBPO7 (ORCPT ); Sat, 2 Nov 2013 11:14:59 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:61068 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753153Ab3KBPOr (ORCPT ); Sat, 2 Nov 2013 11:14:47 -0400 Received: by mail-pb0-f45.google.com with SMTP id ma3so5457584pbc.18 for ; Sat, 02 Nov 2013 08:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5hgh51yVD6sD1AdEPTXhr+8ZS7SrQa+4n/Su2ZuEgSA=; b=ZiXUrP+8rOZLjNEuNUimzooYYSEswGguCVu3qypXLk5IXVFZUmtnuP8Uf9LV0QaiTc znUCcAGBWGxYHyLbx4cWgWAL7Xor/up1o+PCtbLlMqTdN4sl1bS+O2D+ncRy1VzVdj+8 ctFKygbUVYQX8/UEFEMwlVyr7hJ0CZ7+LoH14dh1b29uV5U/R1/iIhn/JK3yN2KZ/N1J pIqbYeqownnCxz3luRX73mQRbsST2yr6t/PfsnOnRGoX4rgKh3I/a7l80i9tFvrqtrBS 9Goe83dC0NWcKP62kM55VpMK2oHHjucq34OmYDiPW7UQO7ZL8JltP9l9zKbPZ15k8BcD 5qRw== X-Received: by 10.66.136.131 with SMTP id qa3mr8579657pab.77.1383405286797; Sat, 02 Nov 2013 08:14:46 -0700 (PDT) Received: from localhost.localdomain.localdomain ([223.65.189.28]) by mx.google.com with ESMTPSA id hu10sm17210488pbc.11.2013.11.02.08.14.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 02 Nov 2013 08:14:46 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: sensille@gmx.net, list.btrfs@jan-o-sch.net, wangsl.fnst@cn.fujitsu.com Subject: [RFC PATCH 2/2] Btrfs: remove subvolume qgroup automatically with qgroup enabled Date: Sat, 2 Nov 2013 23:14:33 +0800 Message-Id: <1383405273-27304-3-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1383405273-27304-1-git-send-email-wangshilong1991@gmail.com> References: <1383405273-27304-1-git-send-email-wangshilong1991@gmail.com> 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.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Wang Shilong When we delete subvolume, the corresponding qgroup will be dead, because Qgroupid/Subvolumeid is not resued. Qgroup accounting will also be triggered to update subvolume qgroup's parent qgroup's referenced size. Signed-off-by: Wang Shilong --- fs/btrfs/ctree.h | 2 ++ fs/btrfs/ioctl.c | 5 ++++- fs/btrfs/qgroup.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 941019d..19a6575 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3997,6 +3997,8 @@ int btrfs_create_qgroup(struct btrfs_trans_handle *trans, char *name); int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, u64 qgroupid); +int btrfs_remove_subvolume_qgroup(struct btrfs_trans_handle *trans, + struct btrfs_fs_info *fs_info, u64 qgroupid); int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, u64 qgroupid, struct btrfs_qgroup_limit *limit); diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 6523108..fdff50d 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2250,7 +2250,10 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, goto out_end_trans; } } - + ret = btrfs_remove_subvolume_qgroup(trans, root->fs_info, + dest->root_key.objectid); + if (ret) + btrfs_abort_transaction(trans, root, ret); out_end_trans: trans->block_rsv = NULL; trans->bytes_reserved = 0; diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 32bedb5..9e9dba9 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1985,3 +1985,68 @@ btrfs_qgroup_rescan_resume(struct btrfs_fs_info *fs_info) btrfs_queue_worker(&fs_info->qgroup_rescan_workers, &fs_info->qgroup_rescan_work); } + +int btrfs_remove_subvolume_qgroup(struct btrfs_trans_handle *trans, + struct btrfs_fs_info *fs_info, + u64 qgroupid) +{ + struct btrfs_root *quota_root; + struct btrfs_qgroup *qgroup; + struct btrfs_qgroup_list *list; + int ret = 0; + + mutex_lock(&fs_info->qgroup_ioctl_lock); + quota_root = fs_info->quota_root; + if (!quota_root) { + ret = -EINVAL; + goto out; + } + + qgroup = find_qgroup_rb(fs_info, qgroupid); + if (!qgroup) { + ret = -ENOENT; + goto out; + } + + list_for_each_entry(list, &qgroup->groups, next_group) { + ret = del_qgroup_relation_item(trans, quota_root, qgroupid, + list->group->qgroupid); + if (ret && ret != -ENOENT) + goto out; + ret = del_qgroup_relation_item(trans, quota_root, + list->group->qgroupid, qgroupid); + if (ret && ret != -ENOENT) + goto out; + } + + /* + * this should not happen with strict hierarchical level + * qgroup. + */ + list_for_each_entry(list, &qgroup->members, next_group) { + ret = del_qgroup_relation_item(trans, quota_root, + list->member->qgroupid, qgroupid); + if (ret && ret != -ENOENT) + goto out; + ret = del_qgroup_relation_item(trans, quota_root, + qgroupid, list->member->qgroupid); + if (ret && ret != -ENOENT) + goto out; + } + ret = del_qgroup_item(trans, quota_root, qgroupid); + if (ret && ret != -ENOENT) + goto out; + spin_lock(&fs_info->qgroup_lock); + ret = qgroup_account_ref_step2(quota_root->fs_info, + quota_root->fs_info->qgroup_ulist, -1, + qgroup->rfer, qgroup); + del_qgroup_rb(quota_root->fs_info, qgroupid); + spin_unlock(&fs_info->qgroup_lock); +out: + mutex_unlock(&fs_info->qgroup_ioctl_lock); + if (ret == -ENOENT) + ret = 0; + return ret; + +} +