aboutsummaryrefslogtreecommitdiffstats
path: root/fs/autofs4/waitq.c
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2006-11-14 02:03:29 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-14 09:09:27 -0800
commitba8df43c0ee93ec05fc526278a80aaf4cb5ab1fa (patch)
tree510db3f9141e0bf091eccaf7ef7a0db3c81338bb /fs/autofs4/waitq.c
parent[PATCH] drivers/ide: stray bracket (diff)
downloadlinux-dev-ba8df43c0ee93ec05fc526278a80aaf4cb5ab1fa.tar.xz
linux-dev-ba8df43c0ee93ec05fc526278a80aaf4cb5ab1fa.zip
[PATCH] autofs4: panic after mount fail
Resolve the panic on failed mount of an autofs filesystem originally reported by Mao Bibo. It addresses two issues that happen after the mount fail. The first a NULL pointer reference to a field (pipe) in the autofs superblock info structure and second the lack of super block cleanup by the autofs and autofs4 modules. Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/autofs4/waitq.c')
-rw-r--r--fs/autofs4/waitq.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index c0a6c8d445c7..1e4a539f4417 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -41,10 +41,8 @@ void autofs4_catatonic_mode(struct autofs_sb_info *sbi)
wake_up_interruptible(&wq->queue);
wq = nwq;
}
- if (sbi->pipe) {
- fput(sbi->pipe); /* Close the pipe */
- sbi->pipe = NULL;
- }
+ fput(sbi->pipe); /* Close the pipe */
+ sbi->pipe = NULL;
}
static int autofs4_write(struct file *file, const void *addr, int bytes)