aboutsummaryrefslogtreecommitdiff
path: root/fs/autofs4/waitq.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-09 01:37:34 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-09 01:37:34 -0500
commit8006fdd6dc387abaa4b683bda4868c879fd76070 (patch)
tree314b08f4923dd9ab24930e6b2ac75889c244b154 /fs/autofs4/waitq.c
parent18ce920a6eba05c0d55cdc95fbbadf7e4c4b457b (diff)
parent7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 (diff)
Merge branch 'upstream'
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 3df86285a1c..394ff36ef8f 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -243,10 +243,8 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
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 ) {