|
 |
beb904 |
autofs-5.1.6 - use master_list_empty() for list empty check
|
|
|
beb904 |
|
|
|
beb904 |
From: Ian Kent <raven@themaw.net>
|
|
|
beb904 |
|
|
|
beb904 |
For consistency use the master_list_empty() function for list empty
|
|
|
beb904 |
checks everywhere.
|
|
|
beb904 |
|
|
|
beb904 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
beb904 |
---
|
|
|
beb904 |
CHANGELOG | 1 +
|
|
|
beb904 |
daemon/automount.c | 2 +-
|
|
|
beb904 |
daemon/master.c | 24 +++++++++++++++++-------
|
|
|
beb904 |
include/master.h | 1 +
|
|
|
beb904 |
4 files changed, 20 insertions(+), 8 deletions(-)
|
|
|
beb904 |
|
|
|
beb904 |
--- autofs-5.1.4.orig/CHANGELOG
|
|
|
beb904 |
+++ autofs-5.1.4/CHANGELOG
|
|
|
beb904 |
@@ -134,6 +134,7 @@ xx/xx/2018 autofs-5.1.5
|
|
|
beb904 |
- only add expre alarm for active mounts.
|
|
|
beb904 |
- move submount check into conditional_alarm_add().
|
|
|
beb904 |
- move lib/master.c to daemon/master.c.
|
|
|
beb904 |
+- use master_list_empty() for list empty check.
|
|
|
beb904 |
|
|
|
beb904 |
19/12/2017 autofs-5.1.4
|
|
|
beb904 |
- fix spec file url.
|
|
|
beb904 |
--- autofs-5.1.4.orig/daemon/automount.c
|
|
|
beb904 |
+++ autofs-5.1.4/daemon/automount.c
|
|
|
beb904 |
@@ -1596,7 +1596,7 @@ static void *statemachine(void *arg)
|
|
|
beb904 |
case SIGUSR2:
|
|
|
beb904 |
master_mutex_lock();
|
|
|
beb904 |
if (list_empty(&master_list->completed)) {
|
|
|
beb904 |
- if (list_empty(&master_list->mounts)) {
|
|
|
beb904 |
+ if (__master_list_empty(master_list)) {
|
|
|
beb904 |
master_mutex_unlock();
|
|
|
beb904 |
return NULL;
|
|
|
beb904 |
}
|
|
|
beb904 |
--- autofs-5.1.4.orig/daemon/master.c
|
|
|
beb904 |
+++ autofs-5.1.4/daemon/master.c
|
|
|
beb904 |
@@ -1110,7 +1110,7 @@ int master_read_master(struct master *ma
|
|
|
beb904 |
master_mount_mounts(master, age);
|
|
|
beb904 |
}
|
|
|
beb904 |
|
|
|
beb904 |
- if (list_empty(&master->mounts))
|
|
|
beb904 |
+ if (__master_list_empty(master))
|
|
|
beb904 |
warn(logopt, "no mounts in table");
|
|
|
beb904 |
|
|
|
beb904 |
master_mutex_unlock();
|
|
|
beb904 |
@@ -1625,7 +1625,7 @@ int dump_map(struct master *master, cons
|
|
|
beb904 |
{
|
|
|
beb904 |
struct list_head *p, *head;
|
|
|
beb904 |
|
|
|
beb904 |
- if (list_empty(&master->mounts)) {
|
|
|
beb904 |
+ if (__master_list_empty(master)) {
|
|
|
beb904 |
printf("no master map entries found\n");
|
|
|
beb904 |
return 1;
|
|
|
beb904 |
}
|
|
|
beb904 |
@@ -1743,7 +1743,7 @@ int master_show_mounts(struct master *ma
|
|
|
beb904 |
printf("global options %s be appended to map entries\n", append);
|
|
|
beb904 |
}
|
|
|
beb904 |
|
|
|
beb904 |
- if (list_empty(&master->mounts)) {
|
|
|
beb904 |
+ if (__master_list_empty(master)) {
|
|
|
beb904 |
printf("no master map entries found\n\n");
|
|
|
beb904 |
return 1;
|
|
|
beb904 |
}
|
|
|
beb904 |
@@ -1831,13 +1831,22 @@ int master_show_mounts(struct master *ma
|
|
|
beb904 |
return 1;
|
|
|
beb904 |
}
|
|
|
beb904 |
|
|
|
beb904 |
-int master_list_empty(struct master *master)
|
|
|
beb904 |
+int __master_list_empty(struct master *master)
|
|
|
beb904 |
{
|
|
|
beb904 |
int res = 0;
|
|
|
beb904 |
|
|
|
beb904 |
- master_mutex_lock();
|
|
|
beb904 |
if (list_empty(&master->mounts))
|
|
|
beb904 |
res = 1;
|
|
|
beb904 |
+
|
|
|
beb904 |
+ return res;
|
|
|
beb904 |
+}
|
|
|
beb904 |
+
|
|
|
beb904 |
+int master_list_empty(struct master *master)
|
|
|
beb904 |
+{
|
|
|
beb904 |
+ int res;
|
|
|
beb904 |
+
|
|
|
beb904 |
+ master_mutex_lock();
|
|
|
beb904 |
+ res = __master_list_empty(master);
|
|
|
beb904 |
master_mutex_unlock();
|
|
|
beb904 |
|
|
|
beb904 |
return res;
|
|
|
beb904 |
@@ -1859,7 +1868,8 @@ int master_done(struct master *master)
|
|
|
beb904 |
master_free_mapent_sources(entry, 1);
|
|
|
beb904 |
master_free_mapent(entry);
|
|
|
beb904 |
}
|
|
|
beb904 |
- if (list_empty(&master->mounts))
|
|
|
beb904 |
+
|
|
|
beb904 |
+ if (__master_list_empty(master))
|
|
|
beb904 |
res = 1;
|
|
|
beb904 |
|
|
|
beb904 |
return res;
|
|
|
beb904 |
@@ -1872,7 +1882,7 @@ unsigned int master_get_logopt(void)
|
|
|
beb904 |
|
|
|
beb904 |
int master_kill(struct master *master)
|
|
|
beb904 |
{
|
|
|
beb904 |
- if (!list_empty(&master->mounts))
|
|
|
beb904 |
+ if (!master_list_empty(master))
|
|
|
beb904 |
return 0;
|
|
|
beb904 |
|
|
|
beb904 |
if (master->name)
|
|
|
beb904 |
--- autofs-5.1.4.orig/include/master.h
|
|
|
beb904 |
+++ autofs-5.1.4/include/master.h
|
|
|
beb904 |
@@ -123,6 +123,7 @@ int master_mount_mounts(struct master *,
|
|
|
beb904 |
int dump_map(struct master *, const char *, const char *);
|
|
|
beb904 |
int master_show_mounts(struct master *);
|
|
|
beb904 |
unsigned int master_get_logopt(void);
|
|
|
beb904 |
+int __master_list_empty(struct master *);
|
|
|
beb904 |
int master_list_empty(struct master *);
|
|
|
beb904 |
int master_done(struct master *);
|
|
|
beb904 |
int master_kill(struct master *);
|