autofs-5.1.7 - pass mapent_cache to update_offset_entry() From: Ian Kent Pass mapent_cache to update_offset_entry() rather than use the wait/signal mechanism, it isn't needed here. Signed-off-by: Ian Kent --- CHANGELOG | 1 + modules/parse_sun.c | 22 ++++++---------------- 2 files changed, 7 insertions(+), 16 deletions(-) --- autofs-5.1.4.orig/CHANGELOG +++ autofs-5.1.4/CHANGELOG @@ -16,6 +16,7 @@ - fix mnts_get_expire_list() expire list construction. - fix inconsistent locking in umount_subtree_mounts(). - fix return from umount_subtree_mounts() on offset list delete. +- pass mapent_cache to update_offset_entry(). xx/xx/2018 autofs-5.1.5 - fix flag file permission. --- autofs-5.1.4.orig/modules/parse_sun.c +++ autofs-5.1.4/modules/parse_sun.c @@ -795,24 +795,17 @@ static int check_is_multi(const char *ma } static int -update_offset_entry(struct autofs_point *ap, const char *name, +update_offset_entry(struct autofs_point *ap, + struct mapent_cache *mc, const char *name, const char *m_root, int m_root_len, - const char *path, const char *myoptions, const char *loc, - time_t age) + const char *path, const char *myoptions, + const char *loc, time_t age) { - struct map_source *source; - struct mapent_cache *mc; char m_key[PATH_MAX + 1]; char m_mapent[MAPENT_MAX_LEN + 1]; int p_len, m_key_len, m_options_len, m_mapent_len; int ret; - source = ap->entry->current; - ap->entry->current = NULL; - master_source_current_signal(ap->entry); - - mc = source->mc; - memset(m_mapent, 0, MAPENT_MAX_LEN + 1); /* Internal hosts map may have loc == NULL */ @@ -1576,11 +1569,8 @@ dont_expand: p += l; p = skipspace(p); - master_source_current_wait(ap->entry); - ap->entry->current = source; - - status = update_offset_entry(ap, name, - m_root, m_root_len, + status = update_offset_entry(ap, mc, + name, m_root, m_root_len, path, myoptions, loc, age); if (status != CHE_OK) {