ca38f0b091
- improve mount location error reporting. - fix paged query more results check. - fix dumpmaps not reading maps. - fix result null check in read_one_map(). - Fix LDAP result leaks on error paths. - code analysis fixes 1. - fix not bind mounting local filesystem. - update dir map-type patch for changed patch order. - fix wait for master source mutex. - fix submount shutdown race - fix fix map source check in file lookup. - add disable move mount configure option.
85 lines
2.2 KiB
Diff
85 lines
2.2 KiB
Diff
autofs-5.0.6 - fix wait for master source mutex
|
|
|
|
From: Ian Kent <ikent@redhat.com>
|
|
|
|
A previous change that was meant to handle the case where the master map
|
|
source mutex read lock count was exceeded was incorrectly done for the
|
|
write lock case instead of the read lock case.
|
|
---
|
|
|
|
CHANGELOG | 1 +
|
|
lib/master.c | 30 +++++++++++++++---------------
|
|
2 files changed, 16 insertions(+), 15 deletions(-)
|
|
|
|
|
|
diff --git a/CHANGELOG b/CHANGELOG
|
|
index 5b988d4..cac450f 100644
|
|
--- a/CHANGELOG
|
|
+++ b/CHANGELOG
|
|
@@ -9,6 +9,7 @@
|
|
- code analysis fixes part 1.
|
|
- fix not bind mounting local filesystem.
|
|
- add "dir" map-type.
|
|
+- fix wait for master source mutex.
|
|
|
|
28/06/2011 autofs-5.0.6
|
|
-----------------------
|
|
diff --git a/lib/master.c b/lib/master.c
|
|
index 6c89e1d..87d1269 100644
|
|
--- a/lib/master.c
|
|
+++ b/lib/master.c
|
|
@@ -540,38 +540,38 @@ void send_map_update_request(struct autofs_point *ap)
|
|
|
|
void master_source_writelock(struct master_mapent *entry)
|
|
{
|
|
- int retries = 5; /* 1 second maximum */
|
|
int status;
|
|
|
|
- while (retries--) {
|
|
- status = pthread_rwlock_wrlock(&entry->source_lock);
|
|
- if (status != EAGAIN)
|
|
- break;
|
|
- else {
|
|
- struct timespec t = { 0, 200000000 };
|
|
- struct timespec r;
|
|
- while (nanosleep(&t, &r) == -1 && errno == EINTR)
|
|
- memcpy(&t, &r, sizeof(struct timespec));
|
|
- }
|
|
- }
|
|
-
|
|
+ status = pthread_rwlock_wrlock(&entry->source_lock);
|
|
if (status) {
|
|
logmsg("master_mapent source write lock failed");
|
|
fatal(status);
|
|
}
|
|
-
|
|
return;
|
|
}
|
|
|
|
void master_source_readlock(struct master_mapent *entry)
|
|
{
|
|
+ int retries = 5; /* 1 second maximum */
|
|
int status;
|
|
|
|
- status = pthread_rwlock_rdlock(&entry->source_lock);
|
|
+ while (retries--) {
|
|
+ status = pthread_rwlock_tryrdlock(&entry->source_lock);
|
|
+ if (status != EAGAIN && status != EBUSY)
|
|
+ break;
|
|
+ else {
|
|
+ struct timespec t = { 0, 200000000 };
|
|
+ struct timespec r;
|
|
+ while (nanosleep(&t, &r) == -1 && errno == EINTR)
|
|
+ memcpy(&t, &r, sizeof(struct timespec));
|
|
+ }
|
|
+ }
|
|
+
|
|
if (status) {
|
|
logmsg("master_mapent source read lock failed");
|
|
fatal(status);
|
|
}
|
|
+
|
|
return;
|
|
}
|
|
|