From patchwork Mon Sep 17 11:38:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianhong Yin X-Patchwork-Id: 10602607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A9B11112B for ; Mon, 17 Sep 2018 11:38:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F21629983 for ; Mon, 17 Sep 2018 11:38:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 832732998A; Mon, 17 Sep 2018 11:38:48 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 33EA129983 for ; Mon, 17 Sep 2018 11:38:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728186AbeIQRFn (ORCPT ); Mon, 17 Sep 2018 13:05:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39000 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726824AbeIQRFm (ORCPT ); Mon, 17 Sep 2018 13:05:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C6145D698; Mon, 17 Sep 2018 11:38:47 +0000 (UTC) Received: from dhcp-12-115.nay.redhat.com (unknown [10.66.12.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5E8258771; Mon, 17 Sep 2018 11:38:45 +0000 (UTC) From: jiyin@redhat.com To: steved@redhat.com Cc: linux-nfs@vger.kernel.org, "Jianhong.Yin" Subject: [PATCH] nfs-utils mount: recover the lost EBUSY Date: Mon, 17 Sep 2018 19:38:38 +0800 Message-Id: <20180917113838.31952-1-jiyin@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 17 Sep 2018 11:38:47 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Jianhong.Yin" see: https://bugzilla.redhat.com/show_bug.cgi?id=1629705 [nfs-utils] mount -osharecache failure but return 'true' mount.nfs4 -o context=system_u:object_r:user_home_dir_t:s0,sharecache $serv:$expdir $nfsmp mount.nfs4 -o context=system_u:object_r:xferlog_t:s0,sharecache $serv:$expdir $nfsmp2 ^^^ here mount fail, but return true. it confuse user! Anyway, we should not hide the failure and pretend that it does not exist. Signed-off-by: Jianhong Yin --- utils/mount/stropts.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 4d2e37e..ca5bc7f 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -1078,15 +1078,6 @@ static int nfsmount_fg(struct nfsmount_info *mi) if (nfs_try_mount(mi)) return EX_SUCCESS; - if (errno == EBUSY) - /* The only cause of EBUSY is if exactly the desired - * filesystem is already mounted. That can arguably - * be seen as success. "mount -a" tries to optimise - * out this case but sometimes fails. Help it out - * by pretending everything is rosy - */ - return EX_SUCCESS; - if (nfs_is_permanent_error(errno)) break;