X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fautofs%2Fwaitq.c;h=19a9cafb5ddf169ae44183171dfde5db3d243581;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=1fcaa1568541c79060996da33a52cd6f6b58d189;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git

diff --git a/fs/autofs/waitq.c b/fs/autofs/waitq.c
index 1fcaa1568..19a9cafb5 100644
--- a/fs/autofs/waitq.c
+++ b/fs/autofs/waitq.c
@@ -41,6 +41,7 @@ void autofs_catatonic_mode(struct autofs_sb_info *sbi)
 		wq = nwq;
 	}
 	fput(sbi->pipe);	/* Close the pipe */
+	sbi->pipe = NULL;
 	autofs_hash_dputall(&sbi->dirhash); /* Remove all dentry pointers */
 }
 
@@ -150,10 +151,8 @@ int autofs_wait(struct autofs_sb_info *sbi, struct qstr *name)
 	if ( sbi->catatonic ) {
 		/* We might have slept, so check again for catatonic mode */
 		wq->status = -ENOENT;
-		if ( wq->name ) {
-			kfree(wq->name);
-			wq->name = NULL;
-		}
+		kfree(wq->name);
+		wq->name = NULL;
 	}
 
 	if ( wq->name ) {