Add nfs.conf equivalent for the statd --no-notify cmdline option
Subsystems (2)
PATCH 1/1 Add nfs.conf equivalent for the statd --no-notify cmdline option
From: Justin Mitchell <[email protected]>
Also cleaned up how nfs.conf is read.
Signed-off-by Justin Mitchell <[email protected]>
Signed-off-by Steve Dickson <[email protected]>
--- nfs.conf | 1 + utils/statd/statd.c | 55 ++++++++++++++++++++++++++++----------------- 2 files changed, 36 insertions(+), 20 deletions(-)
nfs.conf +1 -0
@@ -62,6 +62,7 @@ # name= # state-directory-path=/var/lib/nfs/statd # ha-callout= +# no-notify=0 # [sm-notify] # debug=0
utils/statd/statd.c +35 -20
75 lines not on this page · raw message
Signature · 1 line
2.20.1
Quoted 6 lines · Steve Dickson
From: Justin Mitchell <[email protected]>
Also cleaned up how nfs.conf is read.
Signed-off-by Justin Mitchell <[email protected]>Signed-off-by Steve Dickson <[email protected]>
Committed...
steved.
Quoted 100 lines
--- nfs.conf | 1 + utils/statd/statd.c | 55 ++++++++++++++++++++++++++++----------------- 2 files changed, 36 insertions(+), 20 deletions(-)nfs.conf +1
-0@@ -62,6 +62,7 @@ # name= # state-directory-path=/var/lib/nfs/statd # ha-callout= +# no-notify=0 # [sm-notify] # debug=0utils/statd/statd.c +35
-20@@ -238,6 +238,39 @@ static void set_nlm_port(char *type, int port)fprintf (stderr,"%s: failed to open %s: %s\n" , name_p, pathbuf,strerror (errno)); } +int port =0 , out_port =0 ; +int nlm_udp =0 , nlm_tcp =0 ; + +inline static void +read_nfsconf (char **argv) +{ +char *s; + +conf_init_file (NFS_CONFFILE ); +xlog_from_conffile ("statd" ); + + out_port =conf_get_num ("statd" ,"outgoing-port" , out_port); + port =conf_get_num ("statd" ,"port" , port); + +MY_NAME =conf_get_str ("statd" ,"name" ); +if (MY_NAME ) + run_mode |=STATIC_HOSTNAME ; + + s =conf_get_str ("statd" ,"state-directory-path" ); +if (s && !nsm_setup_pathnames (argv[0 ], s)) +exit (1 ); + + s =conf_get_str ("statd" ,"ha-callout" ); +if (s) + ha_callout_prog = s; + + nlm_tcp =conf_get_num ("lockd" ,"port" , nlm_tcp); +/* udp defaults to the same as tcp ! */ + nlm_udp =conf_get_num ("lockd" ,"udp-port" , nlm_tcp); + +if (conf_get_bool ("statd" ,"no-notify" , false)) + run_mode |=MODE_NO_NOTIFY ; +}/* * Entry routine/main loop. @@ -245,11 +278,8 @@ static void set_nlm_port(char *type, int port)int main (int argc,char **argv) {extern char *optarg; -char *s;int pid;int arg; -int port =0 , out_port =0 ; -int nlm_udp =0 , nlm_tcp =0 ;struct rlimit rlim;int notify_sockfd;char *env;@@ -275,23 +305,8 @@ int main (int argc, char **argv)/* Set hostname */ MY_NAME =NULL ; -conf_init_file (NFS_CONFFILE ); -xlog_from_conffile ("statd" ); - out_port =conf_get_num ("statd" ,"outgoing-port" , out_port); - port =conf_get_num ("statd" ,"port" , port); -MY_NAME =conf_get_str ("statd" ,"name" ); -if (MY_NAME ) - run_mode |=STATIC_HOSTNAME ; - s =conf_get_str ("statd" ,"state-directory-path" ); -if (s && !nsm_setup_pathnames (argv[0 ], s)) -exit (1 ); - s =conf_get_str ("statd" ,"ha-callout" ); -if (s) - ha_callout_prog = s; - - nlm_tcp =conf_get_num ("lockd" ,"port" , nlm_tcp); -/* udp defaults to the same as tcp ! */ - nlm_udp =conf_get_num ("lockd" ,"udp-port" , nlm_tcp); +/* Read nfs.conf */ +read_nfsconf (argv);/* Process command line switches */ while ((arg =getopt_long (argc, argv,"h?vVFNH:dn:p:o:P:LT:U:" , longopts,NULL )) !=EOF ) {