]>
Commit | Line | Data |
---|---|---|
3d551623 PG |
1 | diff --git a/CHANGELOG b/CHANGELOG |
2 | index ddfa6f1..2db9b39 100644 | |
3 | --- a/CHANGELOG | |
4 | +++ b/CHANGELOG | |
5 | @@ -30,6 +30,7 @@ | |
6 | - add LDAP_URI, LDAP_TIMEOUT and LDAP_NETWORK_TIMEOUT configuration options. | |
7 | - fix forground logging and add option to man page. | |
8 | - remove unjustified, nasty comment about krb5 package. | |
9 | +- fix deadlock in submount mount module. | |
10 | ||
11 | 18/06/2007 autofs-5.0.2 | |
12 | ----------------------- | |
13 | diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c | |
14 | index f8d8ed2..c45b91b 100644 | |
15 | --- a/modules/mount_autofs.c | |
16 | +++ b/modules/mount_autofs.c | |
17 | @@ -215,6 +215,8 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, | |
18 | return 1; | |
19 | } | |
20 | ||
21 | + mounts_mutex_lock(ap); | |
22 | + | |
23 | status = pthread_mutex_lock(&suc.mutex); | |
24 | if (status) { | |
25 | crit(ap->logopt, | |
26 | @@ -227,8 +229,6 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, | |
27 | suc.done = 0; | |
28 | suc.status = 0; | |
29 | ||
30 | - mounts_mutex_lock(ap); | |
31 | - | |
32 | if (pthread_create(&thid, NULL, handle_mounts, nap)) { | |
33 | crit(ap->logopt, | |
34 | MODPREFIX |