Subject: Re: [PATCH] sm-notify: Added -f flag to nfs.conf parsing
To:     Linux NFS Mailing list <linux-nfs@vger.kernel.org>
References: <20190215140907.15272-1-steved@redhat.com>
From:   Steve Dickson <SteveD@RedHat.com>
Message-ID: <6f377566-4666-4fb5-52da-e552fcd2e91c@RedHat.com>
Date:   Fri, 1 Mar 2019 15:24:45 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.5.1
MIME-Version: 1.0
In-Reply-To: <20190215140907.15272-1-steved@redhat.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk


On 2/15/19 9:09 AM, Steve Dickson wrote:
> Cleaned up the nfs.conf parsing and added the setting
> of the force to the nfs.conf parsing
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed... 

steved.

> ---
>  nfs.conf                |  1 +
>  utils/statd/sm-notify.c | 33 +++++++++++++++++++++------------
>  2 files changed, 22 insertions(+), 12 deletions(-)
> 
> diff --git a/nfs.conf b/nfs.conf
> index 722b024..f1ebfdb 100644
> --- a/nfs.conf
> +++ b/nfs.conf
> @@ -65,6 +65,7 @@
>  #
>  [sm-notify]
>  # debug=0
> +# force=0
>  # retry-time=900
>  # outgoing-port=
>  # outgoing-addr=
> diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
> index 29dad38..4b6a3a7 100644
> --- a/utils/statd/sm-notify.c
> +++ b/utils/statd/sm-notify.c
> @@ -49,6 +49,7 @@
>  #define NLM_END_GRACE_FILE	"/proc/fs/lockd/nlm_end_grace"
>  
>  int lift_grace = 1;
> +int force = 0;
>  
>  struct nsm_host {
>  	struct nsm_host *	next;
> @@ -480,19 +481,10 @@ nsm_lift_grace_period(void)
>  	close(fd);
>  	return;
>  }
> -
> -int
> -main(int argc, char **argv)
> +inline static void 
> +read_nfs_conf(char **argv)
>  {
> -	int	c, sock, force = 0;
> -	char *	progname;
> -	char *	s;
> -
> -	progname = strrchr(argv[0], '/');
> -	if (progname != NULL)
> -		progname++;
> -	else
> -		progname = argv[0];
> +	char *s;
>  
>  	conf_init_file(NFS_CONFFILE);
>  	xlog_from_conffile("sm-notify");
> @@ -500,10 +492,27 @@ main(int argc, char **argv)
>  	opt_srcport = conf_get_str("sm-notify", "outgoing-port");
>  	opt_srcaddr = conf_get_str("sm-notify", "outgoing-addr");
>  	lift_grace = conf_get_bool("sm-notify", "lift-grace", lift_grace);
> +
>  	s = conf_get_str("statd", "state-directory-path");
>  	if (s && !nsm_setup_pathnames(argv[0], s))
>  		exit(1);
>  	opt_update_state = conf_get_bool("sm-notify", "update-state", opt_update_state);
> +	force = conf_get_bool("sm-notify", "force", force);
> +}
> +
> +int
> +main(int argc, char **argv)
> +{
> +	int	c, sock;
> +	char *	progname;
> +
> +	progname = strrchr(argv[0], '/');
> +	if (progname != NULL)
> +		progname++;
> +	else
> +		progname = argv[0];
> +
> +	read_nfs_conf(argv);
>  
>  	while ((c = getopt(argc, argv, "dm:np:v:P:f")) != -1) {
>  		switch (c) {
>