|
 |
96dc52 |
autofs-5.1.7 - simplify mount_subtree() mount check
|
|
|
96dc52 |
|
|
|
96dc52 |
From: Ian Kent <raven@themaw.net>
|
|
|
96dc52 |
|
|
|
96dc52 |
The check of the return from sun_mount() following the possible mount
|
|
|
96dc52 |
of the root offset in mount_subtree() can be simpler.
|
|
|
96dc52 |
|
|
|
96dc52 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
96dc52 |
---
|
|
|
96dc52 |
CHANGELOG | 1 +
|
|
|
96dc52 |
modules/parse_sun.c | 10 +---------
|
|
|
96dc52 |
2 files changed, 2 insertions(+), 9 deletions(-)
|
|
|
96dc52 |
|
|
|
96dc52 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
96dc52 |
index b1ce7b69..f5c5641a 100644
|
|
|
96dc52 |
--- a/CHANGELOG
|
|
|
96dc52 |
+++ b/CHANGELOG
|
|
|
96dc52 |
@@ -13,6 +13,7 @@
|
|
|
96dc52 |
- remove unused parameter form do_mount_autofs_offset().
|
|
|
96dc52 |
- refactor umount_multi_triggers().
|
|
|
96dc52 |
- eliminate clean_stale_multi_triggers().
|
|
|
96dc52 |
+- simplify mount_subtree() mount check.
|
|
|
96dc52 |
|
|
|
96dc52 |
25/01/2021 autofs-5.1.7
|
|
|
96dc52 |
- make bind mounts propagation slave by default.
|
|
|
96dc52 |
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
|
|
|
96dc52 |
index f4d5125c..1142e8a3 100644
|
|
|
96dc52 |
--- a/modules/parse_sun.c
|
|
|
96dc52 |
+++ b/modules/parse_sun.c
|
|
|
96dc52 |
@@ -1203,15 +1203,7 @@ static int mount_subtree(struct autofs_point *ap, struct mapent *me,
|
|
|
96dc52 |
free(ro_loc);
|
|
|
96dc52 |
}
|
|
|
96dc52 |
|
|
|
96dc52 |
- if (ro && rv == 0) {
|
|
|
96dc52 |
- ret = mount_multi_triggers(ap, me, mm_root, start, mm_base);
|
|
|
96dc52 |
- if (ret == -1) {
|
|
|
96dc52 |
- error(ap->logopt, MODPREFIX
|
|
|
96dc52 |
- "failed to mount offset triggers");
|
|
|
96dc52 |
- cleanup_multi_triggers(ap, me, mm_root, start, mm_base);
|
|
|
96dc52 |
- return 1;
|
|
|
96dc52 |
- }
|
|
|
96dc52 |
- } else if (rv <= 0) {
|
|
|
96dc52 |
+ if ((ro && rv == 0) || rv <= 0) {
|
|
|
96dc52 |
ret = mount_multi_triggers(ap, me, mm_root, start, mm_base);
|
|
|
96dc52 |
if (ret == -1) {
|
|
|
96dc52 |
error(ap->logopt, MODPREFIX
|