d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When there are no automounted filesystems, autounmountd(8) should wait

Browse Source 
for filesystem event, instead of looping on a timeout.

MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2015-01-28 15:46:11 +00:00
parent 0d972b25f6
commit 21cee0c5ce
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.sbin/autofs/autounmountd.c
View File

@ -182,7 +182,7 @@ expire_automounted(double expiration_time)
{
struct automounted_fs *af, *tmpaf;
time_t now;
double mounted_for, mounted_max = 0;
double mounted_for, mounted_max = -1.0;
int error;
now = time(NULL);
@ -231,21 +231,28 @@ do_wait(int kq, double sleep_time)
{
struct timespec timeout;
struct kevent unused;
int error;
int nevents;
assert(sleep_time > 0);
timeout.tv_sec = sleep_time;
timeout.tv_nsec = 0;
if (sleep_time != -1.0) {
assert(sleep_time > 0.0);
timeout.tv_sec = sleep_time;
timeout.tv_nsec = 0;
log_debugx("waiting for filesystem event for %.0f seconds", sleep_time);
error = kevent(kq, NULL, 0, &unused, 1, &timeout);
if (error < 0)
log_debugx("waiting for filesystem event for %.0f seconds", sleep_time);
nevents = kevent(kq, NULL, 0, &unused, 1, &timeout);
} else {
log_debugx("waiting for filesystem event");
nevents = kevent(kq, NULL, 0, &unused, 1, NULL);
}
if (nevents < 0)
log_err(1, "kevent");
if (error == 0)
if (nevents == 0) {
log_debugx("timeout reached");
else
assert(sleep_time > 0.0);
} else {
log_debugx("got filesystem event");
}
}
int
@ -324,7 +331,10 @@ main_autounmountd(int argc, char **argv)
for (;;) {
refresh_automounted();
mounted_max = expire_automounted(expiration_time);
if (mounted_max < expiration_time) {
if (mounted_max == -1.0) {
sleep_time = mounted_max;
log_debugx("no filesystems to expire");
} else if (mounted_max < expiration_time) {
sleep_time = difftime(expiration_time, mounted_max);
log_debugx("some filesystems expire in %.0f seconds",
sleep_time);