|
 |
9a499a |
autofs-5.1.6 - remove force parameter from umount_all()
|
|
|
9a499a |
|
|
|
9a499a |
From: Ian Kent <raven@themaw.net>
|
|
|
9a499a |
|
|
|
9a499a |
The function umount_all() is always called with it's force parameter
|
|
|
9a499a |
true so remove it.
|
|
|
9a499a |
|
|
|
9a499a |
Because the failure case is not used make the function void as well.
|
|
|
9a499a |
|
|
|
9a499a |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
9a499a |
---
|
|
|
9a499a |
CHANGELOG | 1 +
|
|
|
9a499a |
daemon/automount.c | 9 +++------
|
|
|
9a499a |
2 files changed, 4 insertions(+), 6 deletions(-)
|
|
|
9a499a |
|
|
|
9a499a |
--- autofs-5.1.4.orig/CHANGELOG
|
|
|
9a499a |
+++ autofs-5.1.4/CHANGELOG
|
|
|
9a499a |
@@ -125,6 +125,7 @@ xx/xx/2018 autofs-5.1.5
|
|
|
9a499a |
- use mnt_list for submounts.
|
|
|
9a499a |
- use mnt_list for amdmounts.
|
|
|
9a499a |
- make umount_autofs() static.
|
|
|
9a499a |
+- remove force parameter from umount_all().
|
|
|
9a499a |
|
|
|
9a499a |
19/12/2017 autofs-5.1.4
|
|
|
9a499a |
- fix spec file url.
|
|
|
9a499a |
--- autofs-5.1.4.orig/daemon/automount.c
|
|
|
9a499a |
+++ autofs-5.1.4/daemon/automount.c
|
|
|
9a499a |
@@ -99,7 +99,6 @@ pthread_key_t key_thread_attempt_id = (p
|
|
|
9a499a |
|
|
|
9a499a |
int aquire_flag_file(void);
|
|
|
9a499a |
void release_flag_file(void);
|
|
|
9a499a |
-static int umount_all(struct autofs_point *ap, int force);
|
|
|
9a499a |
|
|
|
9a499a |
extern struct master *master_list;
|
|
|
9a499a |
|
|
|
9a499a |
@@ -710,16 +709,14 @@ int umount_multi(struct autofs_point *ap
|
|
|
9a499a |
return left;
|
|
|
9a499a |
}
|
|
|
9a499a |
|
|
|
9a499a |
-static int umount_all(struct autofs_point *ap, int force)
|
|
|
9a499a |
+static void umount_all(struct autofs_point *ap)
|
|
|
9a499a |
{
|
|
|
9a499a |
int left;
|
|
|
9a499a |
|
|
|
9a499a |
left = umount_multi(ap, ap->path, 0);
|
|
|
9a499a |
- if (force && left)
|
|
|
9a499a |
+ if (left)
|
|
|
9a499a |
warn(ap->logopt, "could not unmount %d dirs under %s",
|
|
|
9a499a |
left, ap->path);
|
|
|
9a499a |
-
|
|
|
9a499a |
- return left;
|
|
|
9a499a |
}
|
|
|
9a499a |
|
|
|
9a499a |
static int umount_autofs(struct autofs_point *ap, const char *root)
|
|
|
9a499a |
@@ -737,7 +734,7 @@ static int umount_autofs(struct autofs_p
|
|
|
9a499a |
lookup_close_lookup(ap);
|
|
|
9a499a |
|
|
|
9a499a |
if (ap->type == LKP_INDIRECT) {
|
|
|
9a499a |
- umount_all(ap, 1);
|
|
|
9a499a |
+ umount_all(ap);
|
|
|
9a499a |
ret = umount_autofs_indirect(ap, root);
|
|
|
9a499a |
} else
|
|
|
9a499a |
ret = umount_autofs_direct(ap);
|