From patchwork Wed Mar 27 13:54:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen De Wit X-Patchwork-Id: 2350831 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 013AE3FC8C for ; Wed, 27 Mar 2013 13:57:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751671Ab3C0N5i (ORCPT ); Wed, 27 Mar 2013 09:57:38 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:50250 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750977Ab3C0N5i (ORCPT ); Wed, 27 Mar 2013 09:57:38 -0400 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r2RDvbw9025608 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 27 Mar 2013 13:57:37 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r2RDvaoJ001037 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 27 Mar 2013 13:57:36 GMT Received: from abhmt114.oracle.com (abhmt114.oracle.com [141.146.116.66]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r2RDvaaV006152 for ; Wed, 27 Mar 2013 08:57:36 -0500 Received: from [192.168.0.247] (/178.116.134.76) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 27 Mar 2013 06:57:36 -0700 Message-ID: <5152FA04.8080400@oracle.com> Date: Wed, 27 Mar 2013 14:54:12 +0100 From: Koen De Wit User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.16) Gecko/20111110 Icedove/3.0.11 MIME-Version: 1.0 To: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs-progs: add quota-related info to usage messages X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Extending usage messages with some info on the quota functionality: - The -i option of "subvol create" and "subvol snapshot" was not documented - The -c option of "qgroup limit" is the default option - The "qouta rescan" command is not yet implemented, while it should be executed after enabling quota on a non-empty filesystem. Signed-off-by: Koen De Wit --- cmds-qgroup.c | 3 ++- cmds-quota.c | 4 ++++ cmds-subvolume.c | 11 ++++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cmds-qgroup.c b/cmds-qgroup.c index 275f00f..95aca9b 100644 --- a/cmds-qgroup.c +++ b/cmds-qgroup.c @@ -326,7 +326,8 @@ static const char * const cmd_qgroup_limit_usage[] = { "btrfs qgroup limit [options] |none [] ", "Limit the size of a subvolume quota group.", "", - "-c limit amount of data after compression", + "-c limit amount of data after compression. This is the default,", + " it is currently not possible to turn off this option.", "-e limit space exclusively assigned to this qgroup", NULL }; diff --git a/cmds-quota.c b/cmds-quota.c index 8481514..71cd9f1 100644 --- a/cmds-quota.c +++ b/cmds-quota.c @@ -64,6 +64,9 @@ int quota_ctl(int cmd, int argc, char **argv) static const char * const cmd_quota_enable_usage[] = { "btrfs quota enable ", "Enable subvolume quota support for a filesystem.", + "Any data already present on the filesystem will not count towards", + "the space usage numbers. It is recommended to enable quota for a", + "filesystem before writing any data to it.", NULL }; @@ -92,6 +95,7 @@ static int cmd_quota_disable(int argc, char **argv) static const char * const cmd_quota_rescan_usage[] = { "btrfs quota rescan ", "Rescan the subvolume for a changed quota setting.", + "Not yet implemented.", NULL }; diff --git a/cmds-subvolume.c b/cmds-subvolume.c index 74e2130..b762470 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -61,10 +61,13 @@ static int test_isdir(char *path) } static const char * const cmd_subvol_create_usage[] = { - "btrfs subvolume create [/]", + "btrfs subvolume create [-i ] [/]", "Create a subvolume", "Create a subvolume in . If is not given", "subvolume will be created in the current directory.", + "", + "-i add the newly created subvolume to a qgroup. This", + " option can be given multiple times.", NULL }; @@ -480,12 +483,14 @@ out: } static const char * const cmd_snapshot_usage[] = { - "btrfs subvolume snapshot [-r] [/]", + "btrfs subvolume snapshot [-r] [-i ] [/]", "Create a snapshot of the subvolume", "Create a writable/readonly snapshot of the subvolume with", "the name in the directory", "", - "-r create a readonly snapshot", + "-r create a readonly snapshot", + "-i add the newly created snapshot to a qgroup. This", + " option can be given multiple times.", NULL };