|
 |
96dc52 |
autofs-5.1.7 - add tree_mapent_delete_offsets()
|
|
|
96dc52 |
|
|
|
96dc52 |
From: Ian Kent <raven@themaw.net>
|
|
|
96dc52 |
|
|
|
96dc52 |
Add function tree_mapent_delete_offsets() to the mapent tree handling
|
|
|
96dc52 |
implementation.
|
|
|
96dc52 |
|
|
|
96dc52 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
96dc52 |
---
|
|
|
96dc52 |
CHANGELOG | 1 +
|
|
|
96dc52 |
include/mounts.h | 1 +
|
|
|
96dc52 |
lib/mounts.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
96dc52 |
3 files changed, 72 insertions(+)
|
|
|
96dc52 |
|
|
|
96dc52 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
96dc52 |
index 85730eda..488b4996 100644
|
|
|
96dc52 |
--- a/CHANGELOG
|
|
|
96dc52 |
+++ b/CHANGELOG
|
|
|
96dc52 |
@@ -34,6 +34,7 @@
|
|
|
96dc52 |
- make tree implementation data independent.
|
|
|
96dc52 |
- add mapent tree implementation.
|
|
|
96dc52 |
- add tree_mapent_add_node().
|
|
|
96dc52 |
+- add tree_mapent_delete_offsets().
|
|
|
96dc52 |
|
|
|
96dc52 |
25/01/2021 autofs-5.1.7
|
|
|
96dc52 |
- make bind mounts propagation slave by default.
|
|
|
96dc52 |
diff --git a/include/mounts.h b/include/mounts.h
|
|
|
96dc52 |
index a0e60e24..b5a1193b 100644
|
|
|
96dc52 |
--- a/include/mounts.h
|
|
|
96dc52 |
+++ b/include/mounts.h
|
|
|
96dc52 |
@@ -170,6 +170,7 @@ void mnts_put_expire_list(struct list_head *mnts);
|
|
|
96dc52 |
void mnts_set_mounted_mount(struct autofs_point *ap, const char *name, unsigned int flags);
|
|
|
96dc52 |
struct tree_node *tree_mapent_root(struct mapent *me);
|
|
|
96dc52 |
int tree_mapent_add_node(struct mapent_cache *mc, const char *base, const char *key);
|
|
|
96dc52 |
+int tree_mapent_delete_offsets(struct mapent_cache *mc, const char *key);
|
|
|
96dc52 |
int unlink_mount_tree(struct autofs_point *ap, const char *mp);
|
|
|
96dc52 |
void free_mnt_list(struct mnt_list *list);
|
|
|
96dc52 |
int is_mounted(const char *mp, unsigned int type);
|
|
|
96dc52 |
diff --git a/lib/mounts.c b/lib/mounts.c
|
|
|
96dc52 |
index a0bf3d52..eb700c79 100644
|
|
|
96dc52 |
--- a/lib/mounts.c
|
|
|
96dc52 |
+++ b/lib/mounts.c
|
|
|
96dc52 |
@@ -1528,6 +1528,76 @@ int tree_mapent_add_node(struct mapent_cache *mc,
|
|
|
96dc52 |
return 1;
|
|
|
96dc52 |
}
|
|
|
96dc52 |
|
|
|
96dc52 |
+static int tree_mapent_delete_offset_tree(struct tree_node *root)
|
|
|
96dc52 |
+{
|
|
|
96dc52 |
+ struct mapent *me = MAPENT(root);
|
|
|
96dc52 |
+ unsigned int logopt = me->mc->ap->logopt;
|
|
|
96dc52 |
+ int ret = CHE_OK;
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ if (root->left) {
|
|
|
96dc52 |
+ ret = tree_mapent_delete_offset_tree(root->left);
|
|
|
96dc52 |
+ if (!ret)
|
|
|
96dc52 |
+ return 0;
|
|
|
96dc52 |
+ root->left = NULL;
|
|
|
96dc52 |
+ }
|
|
|
96dc52 |
+ if (root->right) {
|
|
|
96dc52 |
+ ret = tree_mapent_delete_offset_tree(root->right);
|
|
|
96dc52 |
+ if (!ret)
|
|
|
96dc52 |
+ return 0;
|
|
|
96dc52 |
+ root->right = NULL;
|
|
|
96dc52 |
+ }
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ /* Keep the owner of the multi-mount offset tree and clear
|
|
|
96dc52 |
+ * the root and parent when done.
|
|
|
96dc52 |
+ */
|
|
|
96dc52 |
+ if (MAPENT_ROOT(me) != MAPENT_NODE(me)) {
|
|
|
96dc52 |
+ struct tree_node *root = MAPENT_ROOT(me);
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ debug(logopt, "deleting offset key %s", me->key);
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ /* cache_delete won't delete an active offset */
|
|
|
96dc52 |
+ MAPENT_SET_ROOT(me, NULL);
|
|
|
96dc52 |
+ ret = cache_delete(me->mc, me->key);
|
|
|
96dc52 |
+ if (ret != CHE_OK) {
|
|
|
96dc52 |
+ MAPENT_SET_ROOT(me, root);
|
|
|
96dc52 |
+ warn(logopt, "failed to delete offset %s", me->key);
|
|
|
96dc52 |
+ }
|
|
|
96dc52 |
+ } else {
|
|
|
96dc52 |
+ MAPENT_SET_ROOT(me, NULL);
|
|
|
96dc52 |
+ MAPENT_SET_PARENT(me, NULL);
|
|
|
96dc52 |
+ }
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ return ret == CHE_OK ? 1 : 0;
|
|
|
96dc52 |
+}
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+int tree_mapent_delete_offsets(struct mapent_cache *mc, const char *key)
|
|
|
96dc52 |
+{
|
|
|
96dc52 |
+ unsigned int logopt = mc->ap->logopt;
|
|
|
96dc52 |
+ struct mapent *me;
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ me = cache_lookup_distinct(mc, key);
|
|
|
96dc52 |
+ if (!me) {
|
|
|
96dc52 |
+ error(logopt,
|
|
|
96dc52 |
+ "failed to find multi-mount root for key %s", key);
|
|
|
96dc52 |
+ return 0;
|
|
|
96dc52 |
+ }
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ /* Not offset list owner */
|
|
|
96dc52 |
+ if (MAPENT_ROOT(me) != MAPENT_NODE(me)) {
|
|
|
96dc52 |
+ error(logopt,
|
|
|
96dc52 |
+ "mapent for key %s is not multi-mount owner", key);
|
|
|
96dc52 |
+ return 0;
|
|
|
96dc52 |
+ }
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ if (!tree_mapent_delete_offset_tree(MAPENT_ROOT(me))) {
|
|
|
96dc52 |
+ error(logopt,
|
|
|
96dc52 |
+ "could not delete map entry offsets for key %s", key);
|
|
|
96dc52 |
+ return 0;
|
|
|
96dc52 |
+ }
|
|
|
96dc52 |
+
|
|
|
96dc52 |
+ return 1;
|
|
|
96dc52 |
+}
|
|
|
96dc52 |
+
|
|
|
96dc52 |
/* From glibc decode_name() */
|
|
|
96dc52 |
/* Since the values in a line are separated by spaces, a name cannot
|
|
|
96dc52 |
* contain a space. Therefore some programs encode spaces in names
|