From patchwork Thu Mar 28 11:52:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: XiaoLi Feng X-Patchwork-Id: 10874829 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 4E2761708 for ; Thu, 28 Mar 2019 11:52:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39E4928AF2 for ; Thu, 28 Mar 2019 11:52:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D5B828AFA; Thu, 28 Mar 2019 11:52:39 +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 E05E128AF2 for ; Thu, 28 Mar 2019 11:52:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726299AbfC1Lwi (ORCPT ); Thu, 28 Mar 2019 07:52:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36150 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725779AbfC1Lwi (ORCPT ); Thu, 28 Mar 2019 07:52:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 62BF419CF25; Thu, 28 Mar 2019 11:52:38 +0000 (UTC) Received: from dhcp-12-126.nay.redhat.com (dhcp-12-126.nay.redhat.com [10.66.12.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17CF18260B; Thu, 28 Mar 2019 11:52:36 +0000 (UTC) From: XiaoLi Feng To: fstests@vger.kernel.org Cc: smfrench@gmail.com, Xiaoli Feng Subject: [PATCH] common/rc: use _try_scratch_mount for scratch_remount Date: Thu, 28 Mar 2019 19:52:33 +0800 Message-Id: <20190328115233.24816-1-xifeng@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 28 Mar 2019 11:52:38 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Xiaoli Feng When use scratch_remount, it always gives up the global mounted options. Then will make cifs mount failed for generic/306 generic/452. Signed-off-by: Xiaoli Feng --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 1c42515f..6c262e32 100644 --- a/common/rc +++ b/common/rc @@ -357,7 +357,7 @@ _scratch_remount() local opts="$1" if test -n "$opts"; then - mount -o "remount,$opts" $SCRATCH_MNT + _try_scratch_mount "-o remount,$opts" fi }