|
 |
666200 |
diff -up nfs-utils-2.3.3/nfs.conf.orig nfs-utils-2.3.3/nfs.conf
|
|
|
666200 |
--- nfs-utils-2.3.3/nfs.conf.orig 2019-08-13 11:10:15.801644147 -0400
|
|
|
666200 |
+++ nfs-utils-2.3.3/nfs.conf 2019-08-13 11:10:53.767959268 -0400
|
|
|
666200 |
@@ -65,6 +65,7 @@ use-gss-proxy=1
|
|
|
666200 |
#
|
|
|
666200 |
[sm-notify]
|
|
|
666200 |
# debug=0
|
|
|
666200 |
+# force=0
|
|
|
666200 |
# retry-time=900
|
|
|
666200 |
# outgoing-port=
|
|
|
666200 |
# outgoing-addr=
|
|
|
666200 |
diff -up nfs-utils-2.3.3/utils/statd/sm-notify.c.orig nfs-utils-2.3.3/utils/statd/sm-notify.c
|
|
|
666200 |
--- nfs-utils-2.3.3/utils/statd/sm-notify.c.orig 2019-08-13 11:10:15.788644039 -0400
|
|
|
666200 |
+++ nfs-utils-2.3.3/utils/statd/sm-notify.c 2019-08-13 11:10:53.768959276 -0400
|
|
|
666200 |
@@ -49,6 +49,7 @@
|
|
|
666200 |
#define NLM_END_GRACE_FILE "/proc/fs/lockd/nlm_end_grace"
|
|
|
666200 |
|
|
|
666200 |
int lift_grace = 1;
|
|
|
666200 |
+int force = 0;
|
|
|
666200 |
|
|
|
666200 |
struct nsm_host {
|
|
|
666200 |
struct nsm_host * next;
|
|
|
666200 |
@@ -480,19 +481,10 @@ nsm_lift_grace_period(void)
|
|
|
666200 |
close(fd);
|
|
|
666200 |
return;
|
|
|
666200 |
}
|
|
|
666200 |
-
|
|
|
666200 |
-int
|
|
|
666200 |
-main(int argc, char **argv)
|
|
|
666200 |
+inline static void
|
|
|
666200 |
+read_nfsconf(char **argv)
|
|
|
666200 |
{
|
|
|
666200 |
- int c, sock, force = 0;
|
|
|
666200 |
- char * progname;
|
|
|
666200 |
- char * s;
|
|
|
666200 |
-
|
|
|
666200 |
- progname = strrchr(argv[0], '/');
|
|
|
666200 |
- if (progname != NULL)
|
|
|
666200 |
- progname++;
|
|
|
666200 |
- else
|
|
|
666200 |
- progname = argv[0];
|
|
|
666200 |
+ char *s;
|
|
|
666200 |
|
|
|
666200 |
conf_init_file(NFS_CONFFILE);
|
|
|
666200 |
xlog_from_conffile("sm-notify");
|
|
|
666200 |
@@ -500,10 +492,27 @@ main(int argc, char **argv)
|
|
|
666200 |
opt_srcport = conf_get_str("sm-notify", "outgoing-port");
|
|
|
666200 |
opt_srcaddr = conf_get_str("sm-notify", "outgoing-addr");
|
|
|
666200 |
lift_grace = conf_get_bool("sm-notify", "lift-grace", lift_grace);
|
|
|
666200 |
+
|
|
|
666200 |
s = conf_get_str("statd", "state-directory-path");
|
|
|
666200 |
if (s && !nsm_setup_pathnames(argv[0], s))
|
|
|
666200 |
exit(1);
|
|
|
666200 |
opt_update_state = conf_get_bool("sm-notify", "update-state", opt_update_state);
|
|
|
666200 |
+ force = conf_get_bool("sm-notify", "force", force);
|
|
|
666200 |
+}
|
|
|
666200 |
+
|
|
|
666200 |
+int
|
|
|
666200 |
+main(int argc, char **argv)
|
|
|
666200 |
+{
|
|
|
666200 |
+ int c, sock;
|
|
|
666200 |
+ char * progname;
|
|
|
666200 |
+
|
|
|
666200 |
+ progname = strrchr(argv[0], '/');
|
|
|
666200 |
+ if (progname != NULL)
|
|
|
666200 |
+ progname++;
|
|
|
666200 |
+ else
|
|
|
666200 |
+ progname = argv[0];
|
|
|
666200 |
+
|
|
|
666200 |
+ read_nfsconf(argv);
|
|
|
666200 |
|
|
|
666200 |
while ((c = getopt(argc, argv, "dm:np:v:P:f")) != -1) {
|
|
|
666200 |
switch (c) {
|