From 37c07fa0b74a29dea18d359068e9189c5159c49d Mon Sep 17 00:00:00 2001 From: Jianhong Yin Date: Tue, 22 Nov 2016 14:03:37 -0500 Subject: exportfs: remove redundant exports options output before this commit, run 'exportfs -s' will output some options more than one time. for example: /path *(rw,no_root_squash,rw,secure,no_root_squash,no_all_squash) the options rw,no_root_squash,etc will be print twice. the reason is secinfo_show() will show these security options again this patch remove these redundant outputs. Signed-off-by: Jianhong Yin Signed-off-by: Steve Dickson --- utils/exportfs/exportfs.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'utils/exportfs/exportfs.c') diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 98368a5..1816796 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -753,20 +753,18 @@ dump(int verbose, int export_format) c = dumpopt(c, "rw"); if (ep->e_flags & NFSEXP_ASYNC) c = dumpopt(c, "async"); + else + c = dumpopt(c, "sync"); if (ep->e_flags & NFSEXP_GATHERED_WRITES) c = dumpopt(c, "wdelay"); + else + c = dumpopt(c, "no_wdelay"); if (ep->e_flags & NFSEXP_NOHIDE) c = dumpopt(c, "nohide"); + else + c = dumpopt(c, "hide"); if (ep->e_flags & NFSEXP_CROSSMOUNT) c = dumpopt(c, "crossmnt"); - if (ep->e_flags & NFSEXP_INSECURE_PORT) - c = dumpopt(c, "insecure"); - if (ep->e_flags & NFSEXP_ROOTSQUASH) - c = dumpopt(c, "root_squash"); - else - c = dumpopt(c, "no_root_squash"); - if (ep->e_flags & NFSEXP_ALLSQUASH) - c = dumpopt(c, "all_squash"); if (ep->e_flags & NFSEXP_NOSUBTREECHECK) c = dumpopt(c, "no_subtree_check"); if (ep->e_flags & NFSEXP_NOAUTHNLM) -- cgit