From patchwork Sat Jun 30 06:23:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 1134101 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8CE22DFFEA for ; Sat, 30 Jun 2012 06:23:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751193Ab2F3GXM (ORCPT ); Sat, 30 Jun 2012 02:23:12 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:37560 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751164Ab2F3GXL (ORCPT ); Sat, 30 Jun 2012 02:23:11 -0400 Received: by dady13 with SMTP id y13so5270423dad.19 for ; Fri, 29 Jun 2012 23:23:10 -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:x-mailer; bh=KMbHHlKIzbR3sI+spiNohnA2BoIot8YjrZkEX2vxJJE=; b=VxcY1Z2iJE0YJIpKvlu6B4Py5dc9pRZltWU9Bp7wM+Jmka7LsrmzrHwMkOtIzTqkC9 PnN8Iuhg2AMk67M4q4it8FYORWhU2AnL9AzwGBcw6RSQuIAwi+dH01gR5N0y9Ke/12VK nqWHB1uwDSqfVDmk5QZSg0onHi9TGLmeXrhMTZwWRzgQYHHNiBGMBd7l6XzmJnjzeIoe nbcdb2Kl4An87qJUogooY5MnLs7C2tJG6qd9T3axqWSwoOyAPAX8n+EA6dMnc2IG0+42 9fiK+5se0/B3lJz6WOaE4t7P6Umt5slA41vnpYrWDscqZ5aDMOXSnpu4M95AMRTDP23+ XibQ== Received: by 10.66.88.65 with SMTP id be1mr5925160pab.28.1341037390773; Fri, 29 Jun 2012 23:23:10 -0700 (PDT) Received: from linkinjeon-HP-Compaq-nc6230-EA516PA-AB1.kornet ([121.143.184.28]) by mx.google.com with ESMTPS id ob9sm7521414pbb.28.2012.06.29.23.23.07 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 29 Jun 2012 23:23:09 -0700 (PDT) From: Namjae Jeon To: bfields@fieldses.org, Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Namjae Jeon , Amit Sahrawat Subject: [PATCH] nfs-util: Update exportfs flush option list in usage message. Date: Sat, 30 Jun 2012 02:23:01 -0400 Message-Id: <1341037381-24218-1-git-send-email-linkinjeon@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Update exportfs flush option list in usage message. And I sort these cases in alphabetical order. Signed-off-by: Namjae Jeon Signed-off-by: Amit Sahrawat --- utils/exportfs/exportfs.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index a3323d7..9f79541 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -40,7 +40,7 @@ static void unexportfs(char *arg, int verbose); static void exports_update(int verbose); static void dump(int verbose); static void error(nfs_export *exp, int err); -static void usage(const char *progname); +static void usage(const char *progname, int n); static void validate_export(nfs_export *exp); static int matchhostname(const char *hostname1, const char *hostname2); static void export_d_read(const char *dname); @@ -105,11 +105,17 @@ main(int argc, char **argv) export_errno = 0; - while ((c = getopt(argc, argv, "aio:ruvf")) != EOF) { + while ((c = getopt(argc, argv, "afhio:ruv")) != EOF) { switch(c) { case 'a': f_all = 1; break; + case 'f': + force_flush = 1; + break; + case 'h': + usage(progname, 0); + break; case 'i': f_ignore = 1; break; @@ -126,11 +132,8 @@ main(int argc, char **argv) case 'v': f_verbose = 1; break; - case 'f': - force_flush = 1; - break; default: - usage(progname); + usage(progname, 1); break; } } @@ -723,8 +726,8 @@ error(nfs_export *exp, int err) } static void -usage(const char *progname) +usage(const char *progname, int n) { - fprintf(stderr, "usage: %s [-aruv] [host:/path]\n", progname); - exit(1); + fprintf(stderr, "usage: %s [-afhioruv] [host:/path]\n", progname); + exit(n); }