From patchwork Thu Feb 16 19:57:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9578295 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 1A57E60244 for ; Thu, 16 Feb 2017 19:57:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D2772866A for ; Thu, 16 Feb 2017 19:57:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0232B2866E; Thu, 16 Feb 2017 19:57:37 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 B50172866A for ; Thu, 16 Feb 2017 19:57:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933189AbdBPT5h (ORCPT ); Thu, 16 Feb 2017 14:57:37 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34523 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932344AbdBPT5g (ORCPT ); Thu, 16 Feb 2017 14:57:36 -0500 Received: by mail-wr0-f196.google.com with SMTP id c4so3282246wrd.1; Thu, 16 Feb 2017 11:57:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h1USMKsmXydr2rp1zhIV36oZawgzZ54Edm1Y2p5XhLU=; b=AQ5fyJHMFWM3T/qxvrNfwh5wM8NCKw829nYG1Hoxr/jSswAq6AM0kA1CDnOX54dfpk seIWlp05l+tcKPMqKUWbmxrVeM0DgkFt8TTeB/5bVrzdo/K/eDVQ5A+nq+d+AUGgqd2F w24/TqflneNyxqgZydzFKffg1wN6jcD7/iv3qQimZMO034qKXLMnMhxCMOyAtQJqwQlY W9399kC0J3RkYaPtuanNbjBcyXcnJW7hcnBStJ8x8B82p4fehFI3MyvYfrHi8O7GHnTq jRoIW7Crs0PWd5Xvvg5azheKxKIiNkD6VvF2Hj+Xg9SbTM4daARS8EWn2ciRRv0jS8d2 Z9Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=h1USMKsmXydr2rp1zhIV36oZawgzZ54Edm1Y2p5XhLU=; b=N84yG0wIU0ZWWLpclivgPvjB21lVqVLxgHys4E4KtfBpICp95MsKxIIXBKIxtrse3a bieroCWZdIVJOKT7WL+/Ixd1w/pPX50clftbmhU1jTFU9E3KijGth88Pl4iGECd53rSl iEvU5vPdkrPb4XHq+k4af72gFkCAwq2lEBwX9RzkBg5CmazRvhefXn31i4OnWzPZEXoC 2CbY+Ywz8Yt+SMjJQtJas5oYVeTtymRgm4RR7EYUCrl8Ze68QWTrViyfI8SNr2poNoAs t4gQFNxVBdqWDK/6FxkCTTy5yz6Frw891/IT6bjX84IxHLNgXfiziKcQJe4V+UsznYTF 2uhg== X-Gm-Message-State: AMke39kD2bAwES7cHNit9DtYBEOYgx4E+y3My/M2+Z6CX/NlPIyMI4Env8anvTd0jUAjsQ== X-Received: by 10.223.134.218 with SMTP id 26mr3765378wry.104.1487275054992; Thu, 16 Feb 2017 11:57:34 -0800 (PST) Received: from localhost.localdomain (bzq-79-176-143-83.red.bezeqint.net. [79.176.143.83]) by smtp.gmail.com with ESMTPSA id c9sm1437210wmf.18.2017.02.16.11.57.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Feb 2017 11:57:34 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v4 10/10] generic/064: access SCRATCH_MNT after _scratch_mount Date: Thu, 16 Feb 2017 21:57:08 +0200 Message-Id: <1487275028-29885-11-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487275028-29885-1-git-send-email-amir73il@gmail.com> References: <1487275028-29885-1-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Test is calling _get_block_size $SCRATCH_MNT before _scratch_mount. This results in block size of the wrong fs and a failure with overlay base fs setup. Signed-off-by: Amir Goldstein --- tests/generic/064 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/generic/064 b/tests/generic/064 index 8cd31b3..156485e 100755 --- a/tests/generic/064 +++ b/tests/generic/064 @@ -46,14 +46,16 @@ _require_scratch _require_xfs_io_command "fiemap" _require_xfs_io_command "finsert" _require_xfs_io_command "fcollapse" -src=$SCRATCH_MNT/testfile -dest=$SCRATCH_MNT/testfile.dest -BLOCKS=100 -BSIZE=`_get_block_size $SCRATCH_MNT` + rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount || _fail "mount failed" + +src=$SCRATCH_MNT/testfile +dest=$SCRATCH_MNT/testfile.dest +BLOCKS=100 +BSIZE=`_get_block_size $SCRATCH_MNT` length=$(($BLOCKS * $BSIZE)) # Write file