diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-05-11 08:22:35 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-11 08:22:35 -0400 |
| commit | 1a3a403aa98b0ccabeb12abd7da90d33250ea36b (patch) | |
| tree | e111e60854f1e03703c513f9d01e1c63ec410a1e /fs/autofs4/root.c | |
| parent | 6b568a0996c6fd2b833012719788f8d27c7a76d7 (diff) | |
autofs4: Remove another autofs4_lock deadlock
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/autofs4/root.c')
| -rw-r--r-- | fs/autofs4/root.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index a7eaa32c6bae..40ca9360caef 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
| @@ -317,7 +317,6 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
| 317 | * multi-mount with no root mount offset. So don't try to | 317 | * multi-mount with no root mount offset. So don't try to |
| 318 | * mount it again. | 318 | * mount it again. |
| 319 | */ | 319 | */ |
| 320 | spin_lock(&autofs4_lock); | ||
| 321 | spin_lock(&dentry->d_lock); | 320 | spin_lock(&dentry->d_lock); |
| 322 | if (ino->flags & AUTOFS_INF_PENDING || | 321 | if (ino->flags & AUTOFS_INF_PENDING || |
| 323 | (!d_mountpoint(dentry) && list_empty(&dentry->d_subdirs))) { | 322 | (!d_mountpoint(dentry) && list_empty(&dentry->d_subdirs))) { |