autofs: fix careless error in recent commit
authorNeilBrown <neilb@suse.com>
Thu, 14 Dec 2017 23:32:38 +0000 (15:32 -0800)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 17 Jan 2018 17:55:31 +0000 (12:55 -0500)
[ Upstream commit 302ec300ef8a545a7fc7f667e5fd743b091c2eeb ]

Commit ecc0c469f277 ("autofs: don't fail mount for transient error") was
meant to replace an 'if' with a 'switch', but instead added the 'switch'
leaving the case in place.

Link: http://lkml.kernel.org/r/87zi6wstmw.fsf@notabene.neil.brown.name
Fixes: ecc0c469f277 ("autofs: don't fail mount for transient error")
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: NeilBrown <neilb@suse.com>
Cc: Ian Kent <raven@themaw.net>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
fs/autofs4/waitq.c

index fe6e7050fe5020a88edb5d3c883032676487526d..98198c57370b9653c69eafdf9a5176bcb2db8519 100644 (file)
@@ -174,7 +174,6 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
 
        mutex_unlock(&sbi->wq_mutex);
 
-       if (autofs4_write(sbi, pipe, &pkt, pktsz))
        switch (ret = autofs4_write(sbi, pipe, &pkt, pktsz)) {
        case 0:
                break;