From patchwork Tue Aug 26 20:28:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 4783841 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB399C0338 for ; Tue, 26 Aug 2014 20:29:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 279B02015A for ; Tue, 26 Aug 2014 20:29:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1532A20176 for ; Tue, 26 Aug 2014 20:29:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365AbaHZU3i (ORCPT ); Tue, 26 Aug 2014 16:29:38 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:37391 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753236AbaHZU3g (ORCPT ); Tue, 26 Aug 2014 16:29:36 -0400 Received: by mail-lb0-f177.google.com with SMTP id l4so2048047lbv.36 for ; Tue, 26 Aug 2014 13:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9GHryYsidsa+CrsSp17ex1kpEHXIMG7Z+xy+6V+46rE=; b=RmMdPvucYMdoJnMpnj34lBLFEbqiTdM1C5eqKzJrXYLAuDHQ26lw9XRjLD/phxUmnA BwGG5EVtWvigFsGWzyh7tu1YpcOdcDHkuq99YbOY5Jwd+DdM8LMoRFESsuaOMXKUmu+w x/iKVC2fS9MeGCCqOxGKw8dIZvHKHCxMRlTsKMqOW0D2CqJiU/TO8bs98iNeJAH+YH3c rjrRCLMMA0sDrAfms/AOA5jPUWmO1gjfWfBRLrAdnh8a0Jq/XYnBryV1eXtXNrN2VLgF lqE5dHB32FN3fGlRI82r8QfYNfINUFCkE9+lF8GG2ADpOgceHQ/+EwLgPWConTFXJA0s IfBQ== X-Received: by 10.112.209.36 with SMTP id mj4mr28683024lbc.26.1409084975049; Tue, 26 Aug 2014 13:29:35 -0700 (PDT) Received: from localhost.localdomain ([92.43.3.63]) by mx.google.com with ESMTPSA id n11sm6837126lbl.13.2014.08.26.13.29.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Aug 2014 13:29:34 -0700 (PDT) From: Pavel Shilovsky To: fstests@vger.kernel.org Cc: linux-cifs@vger.kernel.org, samba-technical@samba.org, David Disseldorp , Steve French Subject: [PATCH v2 1/3] generic/013: encapsulate remount during cleanup Date: Wed, 27 Aug 2014 00:28:36 +0400 Message-Id: <1409084918-17764-2-git-send-email-pshilovsky@samba.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409084918-17764-1-git-send-email-pshilovsky@samba.org> References: <1409084918-17764-1-git-send-email-pshilovsky@samba.org> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The existing code calls remount for $TEST_DEV with constantly defined mount options. This can fail if a user specifies different mount options. Fix this by using new _test_remount() call that remounts $TEST_DEV. Reviewed-by: Steve French Signed-off-by: Pavel Shilovsky --- common/rc | 6 ++++++ tests/generic/013 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 16da898..d9c9995 100644 --- a/common/rc +++ b/common/rc @@ -218,6 +218,12 @@ _test_mount() _mount -t $FSTYP $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $SELINUX_MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR } +_test_remount() +{ + $UMOUNT_PROG $TEST_DEV + _test_mount +} + _scratch_mkfs_options() { _scratch_options mkfs diff --git a/tests/generic/013 b/tests/generic/013 index 93d9904..534c9f0 100755 --- a/tests/generic/013 +++ b/tests/generic/013 @@ -35,7 +35,7 @@ _cleanup() { cd / # we might get here with a RO FS - mount -o remount,rw $TEST_DEV >/dev/null 2>&1 + _test_remount # now remove fsstress directory. # N.B. rm(1) on IRIX can find problems when building up a long pathname # such that what it has is greater the 1024 chars and will