]> git.hungrycats.org Git - linux/commitdiff
autofs: fix careless error in recent commit
authorNeilBrown <neilb@suse.com>
Thu, 14 Dec 2017 23:32:38 +0000 (15:32 -0800)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Feb 2018 18:32:19 +0000 (18:32 +0000)
commit 302ec300ef8a545a7fc7f667e5fd743b091c2eeb upstream.

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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.2: autofs4_write() doesn't take an autofs_sb_info
 pointer]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/autofs4/waitq.c

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