From patchwork Mon Jun 23 10:28:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 4401061 Return-Path: X-Original-To: patchwork-linux-btrfs@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 2279DBEEAA for ; Mon, 23 Jun 2014 09:28:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6537D20225 for ; Mon, 23 Jun 2014 09:28:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B8F22021A for ; Mon, 23 Jun 2014 09:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751998AbaFWJ2S (ORCPT ); Mon, 23 Jun 2014 05:28:18 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:51396 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751634AbaFWJ2Q (ORCPT ); Mon, 23 Jun 2014 05:28:16 -0400 Received: by mail-wi0-f173.google.com with SMTP id cc10so3746277wib.6 for ; Mon, 23 Jun 2014 02:28:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=2CjrA5f/r9AM29Y5P0hJNSWQEQEK4AzWmAH/ni3Cg/c=; b=AsPnm89ctLZzotXakcYVFOsTE9nN+OZhJlcz9rKIPjoCD59w15fOlr64iq+zlNAZ+e 9pP3S+MKb0M8f6iHHUppNN4Tt+uO0xXI70zOaYqBEMDBaigX1K3ZSvb5yqcUDebP/Dgy /kcL5Ag/Kau8LA5t3HOhWq33f0VIf6M7yyez9Q8UuNHLJhvvGjVszuubJTN0edrG60YT PamIKz5eVZIdWRUWMw6vCwmwLWpnTxeMpubrbWJNLXMcFDSXtRB0AR2I+2kOo3RUeo6w Apc+6RUnFDMfLT0P3JDj066I1lAAgT6ur7Z+pnXNQiL1sGWzU3iCk394ZGYf26z6GVld CTkw== X-Received: by 10.180.187.111 with SMTP id fr15mr24419361wic.57.1403515691747; Mon, 23 Jun 2014 02:28:11 -0700 (PDT) Received: from debian-vm3.lan (bl5-3-159.dsl.telepac.pt. [82.154.3.159]) by mx.google.com with ESMTPSA id k19sm31635030wie.20.2014.06.23.02.28.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jun 2014 02:28:11 -0700 (PDT) From: Filipe David Borba Manana To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe David Borba Manana Subject: [PATCH] generic/017: skip invalid block sizes for btrfs Date: Mon, 23 Jun 2014 11:28:00 +0100 Message-Id: <1403519280-24216-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 In btrfs the block size (called sector size in btrfs) can not be smaller then the page size. Therefore skip block sizes smaller then page size if the fs is btrfs, so that the test can succeed on btrfs (testing only with block sizes of 4kb on systems with a page size of 4Kb). Signed-off-by: Filipe David Borba Manana --- tests/generic/017 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/generic/017 b/tests/generic/017 index 13b7254..6495be5 100755 --- a/tests/generic/017 +++ b/tests/generic/017 @@ -51,6 +51,14 @@ BLOCKS=10240 for (( BSIZE = 1024; BSIZE <= 4096; BSIZE *= 2 )); do + # btrfs doesn't support block size smaller then page size + if [ "$FSTYP" == "btrfs" ]; then + if (( $BSIZE < `getconf PAGE_SIZE` )); then + echo "80" + continue + fi + fi + length=$(($BLOCKS * $BSIZE)) case $FSTYP in xfs)