Re: [PATCH] nfs-utils: exportfs remove redundant exports options output

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 11/18/2016 03:58 AM, Jianhong.Yin wrote:
> 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 <yin-jianhong@xxxxxxx>
Committed!

steved.

> ---
>  utils/exportfs/exportfs.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
> index 98368a5..b11f06b 100644
> --- a/utils/exportfs/exportfs.c
> +++ b/utils/exportfs/exportfs.c
> @@ -747,26 +747,20 @@ 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
> +				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)
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux