From patchwork Tue Nov 7 08:42:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 10045895 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 5FB6960360 for ; Tue, 7 Nov 2017 08:43:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 509E32A091 for ; Tue, 7 Nov 2017 08:43:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 443CE2A0B0; Tue, 7 Nov 2017 08:43:20 +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=-6.9 required=2.0 tests=BAYES_00,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 E64F02A091 for ; Tue, 7 Nov 2017 08:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933649AbdKGInS (ORCPT ); Tue, 7 Nov 2017 03:43:18 -0500 Received: from prv3-mh.provo.novell.com ([137.65.250.26]:60579 "EHLO prv3-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754428AbdKGInJ (ORCPT ); Tue, 7 Nov 2017 03:43:09 -0500 Received: from adam-pc.lan (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by prv3-mh.provo.novell.com with ESMTP (NOT encrypted); Tue, 07 Nov 2017 01:43:04 -0700 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 1/3] btrfs-progs: mkfs: Introduce quota runtime feature Date: Tue, 7 Nov 2017 16:42:45 +0800 Message-Id: <20171107084259.22367-2-wqu@suse.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171107084259.22367-1-wqu@suse.com> References: <20171107084259.22367-1-wqu@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 Introduce quota runtime feature for mkfs. The result fs will has quota enabled, with consistent qgroup accounting. This is quite handy to test quota with fstests, which doesn't support to call ioctl for btrfs at mount time. Signed-off-by: Qu Wenruo --- Documentation/mkfs.btrfs.asciidoc | 7 +++++++ fsfeatures.c | 3 +++ fsfeatures.h | 2 ++ mkfs/main.c | 9 +++++++++ 4 files changed, 21 insertions(+) diff --git a/Documentation/mkfs.btrfs.asciidoc b/Documentation/mkfs.btrfs.asciidoc index 7def34cc9074..66bac3d3eb0c 100644 --- a/Documentation/mkfs.btrfs.asciidoc +++ b/Documentation/mkfs.btrfs.asciidoc @@ -220,6 +220,13 @@ RUNTIME FEATURES Btrfs has some feature which can be enabled by ioctl after mount. Some of such features can also be enabled during creation time. +*quota*:: +(kernel support since 3.4) ++ +Enable btrfs quota support. Result filesystem will have quota enabled and all +qgroup accounting correct. +See also `btrfs-quota`(8). + BLOCK GROUPS, CHUNKS, RAID -------------------------- diff --git a/fsfeatures.c b/fsfeatures.c index 02205dcec32d..c76043be73a2 100644 --- a/fsfeatures.c +++ b/fsfeatures.c @@ -98,6 +98,9 @@ static const struct btrfs_feature mkfs_features[] = { }; static const struct btrfs_feature runtime_features[] = { + { "quota", BTRFS_RUNTIME_FEATURE_QUOTA, NULL, + VERSION_TO_STRING2(3, 4), NULL, 0, NULL, 0, + "enable btrfs quota support" }, /* Keep this one last */ { "list-all", BTRFS_FEATURE_LIST_ALL, NULL } }; diff --git a/fsfeatures.h b/fsfeatures.h index 7ea4a2b47740..131412540c75 100644 --- a/fsfeatures.h +++ b/fsfeatures.h @@ -39,6 +39,8 @@ #define BTRFS_FEATURE_LIST_ALL (1ULL << 63) +#define BTRFS_RUNTIME_FEATURE_QUOTA (1ULL << 0) + void btrfs_list_all_fs_features(u64 mask_disallowed); void btrfs_list_all_runtime_features(u64 mask_disallowed); char *btrfs_parse_fs_features(char *namelist, u64 *flags); diff --git a/mkfs/main.c b/mkfs/main.c index 495284d278e9..76e3e719061e 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1656,6 +1656,7 @@ int main(int argc, char **argv) btrfs_list_all_runtime_features(0); goto success; } + break; } case 's': sectorsize = parse_size(optarg); @@ -2040,6 +2041,14 @@ raid_groups: goto out; } + if (runtime_features & BTRFS_RUNTIME_FEATURE_QUOTA) { + ret = setup_quota_root(fs_info); + if (ret < 0) { + error("failed to initialize quota: %d (%s)", ret, + strerror(-ret)); + goto out; + } + } if (verbose) { char features_buf[64];