Attachment #222930 for bug #251906

Lines 80-85 unmount_by_statfs(const struct statfs *sb, bool force) Link Here

(-)b/usr.sbin/autofs/automount.c (+2 lines)
80	free(fsid_str);	80	free(fsid_str);
81	if (error != 0)	81	if (error != 0)
82	log_warn("cannot unmount %s", sb->f_mntonname);	82	log_warn("cannot unmount %s", sb->f_mntonname);
		83	else
		84	rpc_umntall();
83		85
84	return (error);	86	return (error);
85	}	87	}

Lines 170-176 unmount_by_fsid(const fsid_t fsid, const char *mountpoint) Link Here

(-)b/usr.sbin/autofs/autounmountd.c (-1 / +2 lines)
170	log_warn("cannot unmount %s (%s)",	170	log_warn("cannot unmount %s (%s)",
171	mountpoint, fsid_str);	171	mountpoint, fsid_str);
172	}	172	}
173	}	173	} else
		174	rpc_umntall();
174		175
175	free(fsid_str);	176	free(fsid_str);
176		177




	}
}

/*
 * Applicable to NFSv3 only, see rpc.umntall(8).
 */
void
rpc_umntall(void)
{
	FILE *f;

	f = auto_popen("rpc.umntall", "-k", NULL);
	assert(f != NULL);
	auto_pclose(f);
}

int
main(int argc, char **argv)
{

Lines 96-101 char defined_expand(const char string); Link Here

(-)b/usr.sbin/autofs/common.h (+1 lines)
96	void defined_init(void);	96	void defined_init(void);
97	void defined_parse_and_add(char *def);	97	void defined_parse_and_add(char *def);
98	void lesser_daemon(void);	98	void lesser_daemon(void);
		99	void rpc_umntall(void);
99		100
100	int main_automount(int argc, char **argv);	101	int main_automount(int argc, char **argv);
101	int main_automountd(int argc, char **argv);	102	int main_automountd(int argc, char **argv);

Return to bug 251906

Lines 1204-1209 lesser_daemon(void) Link Here

(-)b/usr.sbin/autofs/common.c (+13 lines)
1204	}	1204	}
1205	}	1205	}
1206		1206
		1207	/*
		1208	* Applicable to NFSv3 only, see rpc.umntall(8).
		1209	*/
		1210	void
		1211	rpc_umntall(void)
		1212	{
		1213	FILE *f;
		1214
		1215	f = auto_popen("rpc.umntall", "-k", NULL);
		1216	assert(f != NULL);
		1217	auto_pclose(f);
		1218	}
		1219
1207	int	1220	int
1208	main(int argc, char **argv)	1221	main(int argc, char **argv)
1209	{	1222	{