From patchwork Mon Aug 15 18:38:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill O'Donnell X-Patchwork-Id: 9281861 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 2FE0C60467 for ; Mon, 15 Aug 2016 18:39:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2405C28E04 for ; Mon, 15 Aug 2016 18:39:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 190B228E3E; Mon, 15 Aug 2016 18:39:00 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AE69E28E04 for ; Mon, 15 Aug 2016 18:38:59 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id 7FFC87CAE; Mon, 15 Aug 2016 13:38:52 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 139EC7CA4 for ; Mon, 15 Aug 2016 13:38:49 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id BDB7030411C for ; Mon, 15 Aug 2016 11:38:48 -0700 (PDT) X-ASG-Debug-ID: 1471286327-0bf8151be31a55f0001-NocioJ Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id FwX0oFCNpC5R7yNo (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 15 Aug 2016 11:38:47 -0700 (PDT) X-Barracuda-Envelope-From: billodo@redhat.com X-Barracuda-Effective-Source-IP: mx1.redhat.com[209.132.183.28] X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 833AC3B72D for ; Mon, 15 Aug 2016 18:38:47 +0000 (UTC) Received: from localhost.localdomain.com (vpn-56-109.rdu2.redhat.com [10.10.56.109]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7FIcjro018199 for ; Mon, 15 Aug 2016 14:38:47 -0400 From: "Bill O'Donnell" To: xfs@oss.sgi.com Subject: [PATCH 3/3] xfs_quota: additional changes to allow use on ext4 Date: Mon, 15 Aug 2016 13:38:31 -0500 X-ASG-Orig-Subj: [PATCH 3/3] xfs_quota: additional changes to allow use on ext4 Message-Id: <1471286311-2730-4-git-send-email-billodo@redhat.com> In-Reply-To: <1471286311-2730-1-git-send-email-billodo@redhat.com> References: <1471286311-2730-1-git-send-email-billodo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 15 Aug 2016 18:38:47 +0000 (UTC) X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1471286327 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.157.11:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 2372 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP Further changes to allow xfs_quota to be used on foreign filesystem(s) (e.g. ext4) for project quota testing in xfstests. Add CMD_FLAG_GENERIC to enable generic xfs_quota commands (help and quit) when xfs_quota is run on foreign filesystems. Use CMD_FLAG_FOREIGN_OK on commands suitable for foreign filesystems. Signed-off-by: Bill O'Donnell --- include/command.h | 1 + libxcmd/help.c | 3 ++- libxcmd/quit.c | 3 ++- quota/init.c | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/command.h b/include/command.h index 81d5a4d..1c2898a 100644 --- a/include/command.h +++ b/include/command.h @@ -22,6 +22,7 @@ #define CMD_FLAG_GLOBAL (1<<31) /* don't iterate "args" */ #define CMD_FLAG_FOREIGN_OK (1<<30) /* command not restricted to XFS */ +#define CMD_FLAG_GENERIC (1<<29) /* command is generic (help, quit) */ typedef int (*cfunc_t)(int argc, char **argv); typedef void (*helpfunc_t)(void); diff --git a/libxcmd/help.c b/libxcmd/help.c index fad0ab9..be26765 100644 --- a/libxcmd/help.c +++ b/libxcmd/help.c @@ -88,7 +88,8 @@ help_init(void) help_cmd.cfunc = help_f; help_cmd.argmin = 0; help_cmd.argmax = 1; - help_cmd.flags = CMD_FLAG_GLOBAL; + help_cmd.flags = CMD_FLAG_GLOBAL | CMD_FLAG_FOREIGN_OK | + CMD_FLAG_GENERIC; help_cmd.args = _("[command]"); help_cmd.oneline = _("help for one or all commands"); diff --git a/libxcmd/quit.c b/libxcmd/quit.c index 0183b8f..2a27c89 100644 --- a/libxcmd/quit.c +++ b/libxcmd/quit.c @@ -38,7 +38,8 @@ quit_init(void) quit_cmd.cfunc = quit_f; quit_cmd.argmin = -1; quit_cmd.argmax = -1; - quit_cmd.flags = CMD_FLAG_GLOBAL; + quit_cmd.flags = CMD_FLAG_GLOBAL | CMD_FLAG_FOREIGN_OK | + CMD_FLAG_GENERIC; quit_cmd.oneline = _("exit the program"); add_command(&quit_cmd); diff --git a/quota/init.c b/quota/init.c index c46ce0f..3b2fd61 100644 --- a/quota/init.c +++ b/quota/init.c @@ -104,7 +104,8 @@ init_check_command( const cmdinfo_t *ct) { if (fs_path && - !(ct->flags & CMD_FLAG_FOREIGN_OK) && + !((ct->flags & CMD_FLAG_FOREIGN_OK) && foreign_allowed) && + !(ct->flags & CMD_FLAG_GENERIC) && (fs_path->fs_flags & FS_FOREIGN)) { fprintf(stderr, _("foreign mount active, %s command is for XFS filesystems only\n"),