|
 |
29d2b9 |
autofs-5.1.7 - don't pass root to do_mount_autofs_offset()
|
|
|
29d2b9 |
|
|
|
29d2b9 |
From: Ian Kent <raven@themaw.net>
|
|
|
29d2b9 |
|
|
|
29d2b9 |
The root parameter of do_mount_autofs_offset() is used only in a
|
|
|
29d2b9 |
debug log message. It doesn't really add any value to debugging
|
|
|
29d2b9 |
so remove it.
|
|
|
29d2b9 |
|
|
|
29d2b9 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
29d2b9 |
---
|
|
|
29d2b9 |
CHANGELOG | 1 +
|
|
|
29d2b9 |
lib/mounts.c | 9 ++++-----
|
|
|
29d2b9 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
29d2b9 |
|
|
|
29d2b9 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
29d2b9 |
index 0e9ca94f..2a07bd45 100644
|
|
|
29d2b9 |
--- a/CHANGELOG
|
|
|
29d2b9 |
+++ b/CHANGELOG
|
|
|
29d2b9 |
@@ -26,6 +26,7 @@
|
|
|
29d2b9 |
- reduce umount EBUSY check delay.
|
|
|
29d2b9 |
- cleanup cache_delete() a little.
|
|
|
29d2b9 |
- rename path to m_offset in update_offset_entry().
|
|
|
29d2b9 |
+- don't pass root to do_mount_autofs_offset().
|
|
|
29d2b9 |
|
|
|
29d2b9 |
25/01/2021 autofs-5.1.7
|
|
|
29d2b9 |
- make bind mounts propagation slave by default.
|
|
|
29d2b9 |
diff --git a/lib/mounts.c b/lib/mounts.c
|
|
|
29d2b9 |
index 25ae2e1d..289500da 100644
|
|
|
29d2b9 |
--- a/lib/mounts.c
|
|
|
29d2b9 |
+++ b/lib/mounts.c
|
|
|
29d2b9 |
@@ -2453,13 +2453,12 @@ out:
|
|
|
29d2b9 |
return rv;
|
|
|
29d2b9 |
}
|
|
|
29d2b9 |
|
|
|
29d2b9 |
-static int do_mount_autofs_offset(struct autofs_point *ap,
|
|
|
29d2b9 |
- struct mapent *oe, const char *root)
|
|
|
29d2b9 |
+static int do_mount_autofs_offset(struct autofs_point *ap, struct mapent *oe)
|
|
|
29d2b9 |
{
|
|
|
29d2b9 |
int mounted = 0;
|
|
|
29d2b9 |
int ret;
|
|
|
29d2b9 |
|
|
|
29d2b9 |
- debug(ap->logopt, "mount offset %s at %s", oe->key, root);
|
|
|
29d2b9 |
+ debug(ap->logopt, "mount offset %s", oe->key);
|
|
|
29d2b9 |
|
|
|
29d2b9 |
ret = mount_autofs_offset(ap, oe);
|
|
|
29d2b9 |
if (ret >= MOUNT_OFFSET_OK)
|
|
|
29d2b9 |
@@ -2651,7 +2650,7 @@ static int do_umount_offset(struct autofs_point *ap,
|
|
|
29d2b9 |
*/
|
|
|
29d2b9 |
ret = rmdir_path_offset(ap, oe);
|
|
|
29d2b9 |
if (ret == -1 && !stat(oe->key, &st)) {
|
|
|
29d2b9 |
- ret = do_mount_autofs_offset(ap, oe, root);
|
|
|
29d2b9 |
+ ret = do_mount_autofs_offset(ap, oe);
|
|
|
29d2b9 |
if (ret)
|
|
|
29d2b9 |
left++;
|
|
|
29d2b9 |
/* But we did origianlly create this */
|
|
|
29d2b9 |
@@ -2697,7 +2696,7 @@ int mount_multi_triggers(struct autofs_point *ap, struct mapent *me,
|
|
|
29d2b9 |
goto cont;
|
|
|
29d2b9 |
}
|
|
|
29d2b9 |
|
|
|
29d2b9 |
- mounted += do_mount_autofs_offset(ap, oe, root);
|
|
|
29d2b9 |
+ mounted += do_mount_autofs_offset(ap, oe);
|
|
|
29d2b9 |
|
|
|
29d2b9 |
/*
|
|
|
29d2b9 |
* If re-constructing a multi-mount it's necessary to walk
|