From patchwork Tue Feb 28 12:18:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9595341 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 69B9260429 for ; Tue, 28 Feb 2017 12:20:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BC17284DC for ; Tue, 28 Feb 2017 12:20:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50D4F284E9; Tue, 28 Feb 2017 12:20:45 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 DB552284DC for ; Tue, 28 Feb 2017 12:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752445AbdB1MUm (ORCPT ); Tue, 28 Feb 2017 07:20:42 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:33750 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751903AbdB1MUQ (ORCPT ); Tue, 28 Feb 2017 07:20:16 -0500 Received: by mail-wr0-f196.google.com with SMTP id g10so1404810wrg.0; Tue, 28 Feb 2017 04:18:52 -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=Wt9vtedA0y3S0OoVNgX/rTO4+3kYaXcxxBv3yormdHBG54rXEW2p+Kkk9Rd3xG8qPe lL47K3gDO4r5rmvFPd86p7zj8tOI4igW5dAJSTN9+jizi+oawvdTXCPO2ZCBB6MdnAbO DatMuVRn8ckcbLEi1u4+sEN4cWmkIH4hyEFtN2Ru0OLHU7HHOfay8oZNtJ/o3LBInnfB UkICiRYar6aMTkGybyyxlw1Ti/n+LywWyVF13EY1V0X+L4yWkSyzqXo3Zc6LRcBynSRv PFTaUxCo72Oy5fVMwfvK541hoq4BreBZySEUpEC+ftT/dWeVDToqVVZ7T9jv494b+Pa7 DkGw== 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=Re6Lza7blJwF91YnjvsgKc/TWeU0t6om8FUdqvRvJrY0qESMxLxKcHLgpnkGMrGITF 0GZiez8y9pU+LE8VkQmE8G10cIfPNk1qjjgRzWVF03Mjer807+T2o2hnvxsyiMS3bDbn U0V43qqvuTJ7evpeyXzpRortQsvx1RHrSHhpMGzzRFAm8ywrjQWv4oQ3qpHjlh40PP+u 0eL0oS8KznLI+CStAOnvoRb+8xk8FUQ/VkY0ljjEtb0Xyln/Bs2zDFni8ro9XaltsgSM GOvVaT5KEcG4vlc+Y/P2C2IBWrP364oxcIbx4BgYaAS4yLtAzOv1XPRDdgr5oe8DGi2Y 83aw== X-Gm-Message-State: AMke39ld6ENuvaagnKZMxi7x7OZBW7ooy348ooAxYfFG70VIffHmtHlt9C7rMU3A2hbkAg== X-Received: by 10.223.155.193 with SMTP id e1mr1651685wrc.86.1488284332093; Tue, 28 Feb 2017 04:18:52 -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 b58sm2105796wra.47.2017.02.28.04.18.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 04:18:51 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , Xiong Zhou , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v5 06/10] generic/064: access SCRATCH_MNT after _scratch_mount Date: Tue, 28 Feb 2017 14:18:33 +0200 Message-Id: <1488284317-3119-7-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488284317-3119-1-git-send-email-amir73il@gmail.com> References: <1488284317-3119-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