From patchwork Fri Jan 12 05:47:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jianhong.Yin" X-Patchwork-Id: 10159615 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 39EEF6029B for ; Fri, 12 Jan 2018 05:48:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B29F288ED for ; Fri, 12 Jan 2018 05:48:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FF31288F3; Fri, 12 Jan 2018 05:48:07 +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,FREEMAIL_FROM, 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 7AAB1288ED for ; Fri, 12 Jan 2018 05:48:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754280AbeALFsF (ORCPT ); Fri, 12 Jan 2018 00:48:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54234 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754273AbeALFsE (ORCPT ); Fri, 12 Jan 2018 00:48:04 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72FD585A07; Fri, 12 Jan 2018 05:48:04 +0000 (UTC) Received: from dhcp-12-238.nay.redhat.com (dhcp-12-238.nay.redhat.com [10.66.12.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 412974DC76; Fri, 12 Jan 2018 05:48:03 +0000 (UTC) From: "Jianhong.Yin" To: linux-nfs@vger.kernel.org Cc: steved@redhat.com, "Jianhong.Yin" Subject: [PATCH] exportfs: move ro/rw option back to secinfo_flag_displaymap table Date: Fri, 12 Jan 2018 13:47:57 +0800 Message-Id: <20180112054757.23927-1-yin-jianhong@163.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 12 Jan 2018 05:48:04 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP according https://bugzilla.redhat.com/show_bug.cgi?id=1532688#c3 ro/rw options should be in secinfo_flag_displaymap[] test pass: ''' [yjh@test ~]$ cat /etc/exports /export_test 127.0.0.1(rw,wdelay,no_root_squash,no_subtree_check,sec=sys,root_squash,all_squash,sec=krb5,ro,root_squash,no_all_squash,sec=krb5i,rw,root_squash,no_all_squash,sec=krb5p,no_root_squash,no_all_squash) [yjh@test ~]$ sudo service nfs restart Redirecting to /bin/systemctl restart nfs.service [yjh@test ~]$ sudo exportfs -v /export_test 127.0.0.1(sync,wdelay,hide,no_subtree_check,sec=sys,rw,secure,root_squash,all_squash,sec=krb5,ro,secure,root_squash,no_all_squash,sec=krb5i,rw,secure,root_squash,no_all_squash,sec=krb5p,rw,secure,no_root_squash,no_all_squash) ''' Signed-off-by: Jianhong Yin --- support/nfs/exports.c | 1 + utils/exportfs/exportfs.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/support/nfs/exports.c b/support/nfs/exports.c index 92bd6e6..b59d187 100644 --- a/support/nfs/exports.c +++ b/support/nfs/exports.c @@ -197,6 +197,7 @@ static const struct secinfo_flag_displaymap { const char *set; const char *unset; } secinfo_flag_displaymap[] = { + { NFSEXP_READONLY, "ro", "rw" }, { NFSEXP_INSECURE_PORT, "insecure", "secure" }, { NFSEXP_ROOTSQUASH, "root_squash", "no_root_squash" }, { NFSEXP_ALLSQUASH, "all_squash", "no_all_squash" }, diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 448f195..cd3c979 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -695,10 +695,6 @@ dump(int verbose, int export_format) continue; } c = '('; - if (ep->e_flags & NFSEXP_READONLY) - c = dumpopt(c, "ro"); - else - c = dumpopt(c, "rw"); if (ep->e_flags & NFSEXP_ASYNC) c = dumpopt(c, "async"); else