From patchwork Tue Dec 5 22:21:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 10093935 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4503A6056E for ; Tue, 5 Dec 2017 22:22:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3852224B5B for ; Tue, 5 Dec 2017 22:22:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D3DB28639; Tue, 5 Dec 2017 22:22:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD8B924B5B for ; Tue, 5 Dec 2017 22:22:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752415AbdLEWVy (ORCPT ); Tue, 5 Dec 2017 17:21:54 -0500 Received: from mx2.suse.de ([195.135.220.15]:42741 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbdLEWVv (ORCPT ); Tue, 5 Dec 2017 17:21:51 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "Cc" Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1E54AAF71; Tue, 5 Dec 2017 22:21:50 +0000 (UTC) From: NeilBrown To: Ian Kent , Andrew Morton Date: Wed, 06 Dec 2017 09:21:43 +1100 Cc: lkml , linux-fsdevel@vger.kernel.org Subject: [PATCH] autofs: fix careless error in recent commit. In-Reply-To: <87y3norvgp.fsf@notabene.neil.brown.name> References: <87y3norvgp.fsf@notabene.neil.brown.name> cc: Ben Hutchings Message-ID: <87zi6wstmw.fsf@notabene.neil.brown.name> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit ecc0c469f277 was meant to replace an 'if' with a 'switch', but instead added the 'switch' leaving the case in place. Reported-by: Ben Hutchings Cc: stable@vger.kernel.org Fixes: ecc0c469f277 ("autofs: don't fail mount for transient error") Signed-off-by: NeilBrown --- fs/autofs4/waitq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c index 8fc41705c7cd..961a12dc6dc8 100644 --- a/fs/autofs4/waitq.c +++ b/fs/autofs4/waitq.c @@ -170,7 +170,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;