From patchwork Fri Feb 22 12:02:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2175711 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 413543FCFC for ; Fri, 22 Feb 2013 12:03:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756938Ab3BVMDA (ORCPT ); Fri, 22 Feb 2013 07:03:00 -0500 Received: from mail-pb0-f54.google.com ([209.85.160.54]:53635 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756367Ab3BVMC7 (ORCPT ); Fri, 22 Feb 2013 07:02:59 -0500 Received: by mail-pb0-f54.google.com with SMTP id rr4so368804pbb.41 for ; Fri, 22 Feb 2013 04:02:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=w0dTcCuKK4kThNtQVr8db9Jb3ab7s7s/HvIUq72LA/A=; b=j3RJf2/QjEH9fTK0OkHeBimOGIlRP+lfuBWIegUzeAQ1W3oduhuFrTleWjtTeyNfBR zr9jgL3fSbpPt0J8qiHVj5t9GA+733ngDyjmG7ZICuVBQTCHKTeFNYxmc4ghwhHwo48G Q9Z8d4jzp6QBMzjWXVbCBoWMJwP89rTfg8zOw7ZGrp2/nwznaqNKeLt4WJ+AIaKeLjaq VRHbtHqTfq7jHsAC9qK+xWOV4Py/ZMScGfZ+a544/ZZR2+czeS5TxVhFdL0tGtfT8lND SD+fnDEeBljXV4j8OO5xbc+jig846Fbo/07cPr1+GKTXS1HSw0zDW7YsNBVHZ/AzwePY kFmw== X-Received: by 10.68.41.66 with SMTP id d2mr2601939pbl.154.1361534578850; Fri, 22 Feb 2013 04:02:58 -0800 (PST) Received: from localhost.localdomain ([223.65.185.63]) by mx.google.com with ESMTPS id o1sm2793877pax.2.2013.02.22.04.02.56 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 22 Feb 2013 04:02:58 -0800 (PST) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: sensille@gmx.net Subject: [PATCH 2/2] Btrfs: disable the qgroup level 0 for userspace use Date: Fri, 22 Feb 2013 20:02:53 +0800 Message-Id: <1361534573-2412-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Wang Shilong This patch tries to stop users to create/destroy qgroup level 0, users can only create/destroy qgroup level more than 0. See the fact: a subvolume/snapshot qgroup was created automatically when creating subvolume/snapshot, so creating a qgroup level 0 can't be a subvolume/snapshot qgroup, the only way to use it is that assigning subvolume/snapshot qgroup to it, the point is that we don't want to have a parent qgroup whose level is 0. So we want to force users to use qgroup with clear relations which means a parent qgroup's level > child qgroup's level.For example: 2/0 / \ / \ / \ 1/0 1/1 / \ \ / \ \ / \ \ 0/256 0/257 0/258 This pattern of quota is nature and easy for users to understand, otherwise it will make the quota configuration confusing and difficult to maintain. Signed-off-by: Wang Shilong Acked-by: Miao Xie Cc: Arne Jansen --- fs/btrfs/ioctl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index a31cd93..3590c21 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3755,7 +3755,7 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg) goto drop_write; } - if (!sa->qgroupid) { + if (!(sa->qgroupid >> 48)) { ret = -EINVAL; goto out; }