|
 |
9a499a |
autofs-5.1.7 - don't pass root to do_mount_autofs_offset()
|
|
|
9a499a |
|
|
|
9a499a |
From: Ian Kent <raven@themaw.net>
|
|
|
9a499a |
|
|
|
9a499a |
The root parameter of do_mount_autofs_offset() is used only in a
|
|
|
9a499a |
debug log message. It doesn't really add any value to debugging
|
|
|
9a499a |
so remove it.
|
|
|
9a499a |
|
|
|
9a499a |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
9a499a |
---
|
|
|
9a499a |
CHANGELOG | 1 +
|
|
|
9a499a |
lib/mounts.c | 9 ++++-----
|
|
|
9a499a |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
9a499a |
|
|
|
9a499a |
--- autofs-5.1.4.orig/CHANGELOG
|
|
|
9a499a |
+++ autofs-5.1.4/CHANGELOG
|
|
|
9a499a |
@@ -25,6 +25,7 @@
|
|
|
9a499a |
- reduce umount EBUSY check delay.
|
|
|
9a499a |
- cleanup cache_delete() a little.
|
|
|
9a499a |
- rename path to m_offset in update_offset_entry().
|
|
|
9a499a |
+- don't pass root to do_mount_autofs_offset().
|
|
|
9a499a |
|
|
|
9a499a |
xx/xx/2018 autofs-5.1.5
|
|
|
9a499a |
- fix flag file permission.
|
|
|
9a499a |
--- autofs-5.1.4.orig/lib/mounts.c
|
|
|
9a499a |
+++ autofs-5.1.4/lib/mounts.c
|
|
|
9a499a |
@@ -2447,13 +2447,12 @@ out:
|
|
|
9a499a |
return rv;
|
|
|
9a499a |
}
|
|
|
9a499a |
|
|
|
9a499a |
-static int do_mount_autofs_offset(struct autofs_point *ap,
|
|
|
9a499a |
- struct mapent *oe, const char *root)
|
|
|
9a499a |
+static int do_mount_autofs_offset(struct autofs_point *ap, struct mapent *oe)
|
|
|
9a499a |
{
|
|
|
9a499a |
int mounted = 0;
|
|
|
9a499a |
int ret;
|
|
|
9a499a |
|
|
|
9a499a |
- debug(ap->logopt, "mount offset %s at %s", oe->key, root);
|
|
|
9a499a |
+ debug(ap->logopt, "mount offset %s", oe->key);
|
|
|
9a499a |
|
|
|
9a499a |
ret = mount_autofs_offset(ap, oe);
|
|
|
9a499a |
if (ret >= MOUNT_OFFSET_OK)
|
|
|
9a499a |
@@ -2645,7 +2644,7 @@ static int do_umount_offset(struct autof
|
|
|
9a499a |
*/
|
|
|
9a499a |
ret = rmdir_path_offset(ap, oe);
|
|
|
9a499a |
if (ret == -1 && !stat(oe->key, &st)) {
|
|
|
9a499a |
- ret = do_mount_autofs_offset(ap, oe, root);
|
|
|
9a499a |
+ ret = do_mount_autofs_offset(ap, oe);
|
|
|
9a499a |
if (ret)
|
|
|
9a499a |
left++;
|
|
|
9a499a |
/* But we did origianlly create this */
|
|
|
9a499a |
@@ -2691,7 +2690,7 @@ int mount_multi_triggers(struct autofs_p
|
|
|
9a499a |
goto cont;
|
|
|
9a499a |
}
|
|
|
9a499a |
|
|
|
9a499a |
- mounted += do_mount_autofs_offset(ap, oe, root);
|
|
|
9a499a |
+ mounted += do_mount_autofs_offset(ap, oe);
|
|
|
9a499a |
|
|
|
9a499a |
/*
|
|
|
9a499a |
* If re-constructing a multi-mount it's necessary to walk
|