|
 |
29d2b9 |
autofs-5.1.7 - remove unused function master_submount_list_empty()
|
|
|
29d2b9 |
|
|
|
29d2b9 |
From: Ian Kent <raven@themaw.net>
|
|
|
29d2b9 |
|
|
|
29d2b9 |
This function is not used anywhere now, remove it.
|
|
|
29d2b9 |
|
|
|
29d2b9 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
29d2b9 |
---
|
|
|
29d2b9 |
CHANGELOG | 1 +
|
|
|
29d2b9 |
daemon/master.c | 12 ------------
|
|
|
29d2b9 |
include/master.h | 1 -
|
|
|
29d2b9 |
3 files changed, 1 insertion(+), 13 deletions(-)
|
|
|
29d2b9 |
|
|
|
29d2b9 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
29d2b9 |
index 1c9e2a2d..002da042 100644
|
|
|
29d2b9 |
--- a/CHANGELOG
|
|
|
29d2b9 |
+++ b/CHANGELOG
|
|
|
29d2b9 |
@@ -45,6 +45,7 @@
|
|
|
29d2b9 |
- remove redundant local var from sun_mount().
|
|
|
29d2b9 |
- use mount_fullpath() in one spot in parse_mount().
|
|
|
29d2b9 |
- pass root length to mount_fullpath().
|
|
|
29d2b9 |
+- remove unused function master_submount_list_empty().
|
|
|
29d2b9 |
|
|
|
29d2b9 |
25/01/2021 autofs-5.1.7
|
|
|
29d2b9 |
- make bind mounts propagation slave by default.
|
|
|
29d2b9 |
diff --git a/daemon/master.c b/daemon/master.c
|
|
|
29d2b9 |
index 022fb9dd..af9cd79f 100644
|
|
|
29d2b9 |
--- a/daemon/master.c
|
|
|
29d2b9 |
+++ b/daemon/master.c
|
|
|
29d2b9 |
@@ -1119,18 +1119,6 @@ int master_read_master(struct master *master, time_t age)
|
|
|
29d2b9 |
return 1;
|
|
|
29d2b9 |
}
|
|
|
29d2b9 |
|
|
|
29d2b9 |
-int master_submount_list_empty(struct autofs_point *ap)
|
|
|
29d2b9 |
-{
|
|
|
29d2b9 |
- int res = 0;
|
|
|
29d2b9 |
-
|
|
|
29d2b9 |
- mounts_mutex_lock(ap);
|
|
|
29d2b9 |
- if (list_empty(&ap->submounts))
|
|
|
29d2b9 |
- res = 1;
|
|
|
29d2b9 |
- mounts_mutex_unlock(ap);
|
|
|
29d2b9 |
-
|
|
|
29d2b9 |
- return res;
|
|
|
29d2b9 |
-}
|
|
|
29d2b9 |
-
|
|
|
29d2b9 |
int master_notify_submount(struct autofs_point *ap, const char *path, enum states state)
|
|
|
29d2b9 |
{
|
|
|
29d2b9 |
struct mnt_list *this, *sbmnt;
|
|
|
29d2b9 |
diff --git a/include/master.h b/include/master.h
|
|
|
29d2b9 |
index 0806b372..2d727943 100644
|
|
|
29d2b9 |
--- a/include/master.h
|
|
|
29d2b9 |
+++ b/include/master.h
|
|
|
29d2b9 |
@@ -116,7 +116,6 @@ void master_free_mapent_sources(struct master_mapent *, unsigned int);
|
|
|
29d2b9 |
void master_free_mapent(struct master_mapent *);
|
|
|
29d2b9 |
struct master *master_new(const char *, unsigned int, unsigned int);
|
|
|
29d2b9 |
int master_read_master(struct master *, time_t);
|
|
|
29d2b9 |
-int master_submount_list_empty(struct autofs_point *ap);
|
|
|
29d2b9 |
int master_notify_submount(struct autofs_point *, const char *path, enum states);
|
|
|
29d2b9 |
void master_notify_state_change(struct master *, int);
|
|
|
29d2b9 |
int master_mount_mounts(struct master *, time_t);
|