autofs-5.1.9 - log when setting amd per-mount timeout From: Ian Kent Log action when setting amd per-mount expire timeout. Signed-off-by: Ian Kent --- CHANGELOG | 1 + modules/parse_amd.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 920e99503..87bf6ebf2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,7 @@ - fix submount shutdown race. - fix lookup search type in umount_subtree_mounts(). - fix remount_active_mount() not remounting symlinks. +- log when setting amd per-mount timeout. 02/11/2023 autofs-5.1.9 - fix kernel mount status notification. diff --git a/modules/parse_amd.c b/modules/parse_amd.c index 23f589450..bb32895e2 100644 --- a/modules/parse_amd.c +++ b/modules/parse_amd.c @@ -1762,16 +1762,24 @@ static int amd_mount(struct autofs_point *ap, const char *name, "non-zero timeout set, possible conflicting options"); /* "nounmount" option, don't expire this mount. */ - if (ops) + if (ops) { + info(ap->logopt, + "set amd per-mount expire timeout to 0 for %s", + name); ops->timeout(ap->logopt, ap->ioctlfd, name, 0); + } } else if (per_mnt_flags & AMD_MOUNT_OPT_UTIMEOUT) { if (!entry->utimeout) warn(ap->logopt, "zero timeout set, possible conflicting options"); /* "utimeout" option, expire this mount according to a timeout. */ - if (ops) + if (ops) { + info(ap->logopt, + "set amd per-dentry expire timeout to %d for %s", + entry->utimeout, name); ops->timeout(ap->logopt, ap->ioctlfd, name, entry->utimeout); + } } } done: