From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D293CA9EAF for ; Thu, 24 Oct 2019 20:46:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62E002084C for ; Thu, 24 Oct 2019 20:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571950019; bh=qG//jemOf0oV7yOFCo4p6dDb+1bp2vMf1ErKHQyQct0=; h=From:To:Cc:Subject:Date:List-ID:From; b=BIa8mnGaZKjtwVBgrAHSevCN+zFoFdXxeirEHydVooktVh79WOWKg4ij4n+0HCEEt BbbuK3aQXe6ASrBCBCeD458At7Sq+ZrMcUBpDaEZRhe/DopfI4JHp1OrQYVIdBnPVM 4MfDjmJlDqiRqIpx9GRKbl/aPMtsuGtQrXyQunf8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727048AbfJXUq7 (ORCPT ); Thu, 24 Oct 2019 16:46:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:42134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726973AbfJXUq7 (ORCPT ); Thu, 24 Oct 2019 16:46:59 -0400 Received: from ebiggers-linuxstation.mtv.corp.google.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5B5CC20578; Thu, 24 Oct 2019 20:46:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571950018; bh=qG//jemOf0oV7yOFCo4p6dDb+1bp2vMf1ErKHQyQct0=; h=From:To:Cc:Subject:Date:From; b=BFsIDGH6/024dJ2xIIQ7ihyt6NIegUJ5bXhyScRWsj0UNXJZKfMNrB7tsv8pnQTWu uDl89+oVJLG33wo3AbKwcDK2LuGFuZb2LEPjjEQSQXPyhiEgJmKvedkODYJIsKglqx UiViBdydGTvrFYA50tJkpzYjndSIbYEOFwU98lzA= From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH] common/rc: skip encrypted direct I/O tests on f2fs Date: Thu, 24 Oct 2019 13:45:29 -0700 Message-Id: <20191024204529.90714-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Eric Biggers Skip the O_DIRECT tests on f2fs when the test_dummy_encryption mount option is given, for the same reason as given for ext4 in commit 9b154b26e4a1 ("common/rc: ext4 doesn't support O_DIRECT with encryption"). Signed-off-by: Eric Biggers --- common/rc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/rc b/common/rc index cfaabf10..7c94307a 100644 --- a/common/rc +++ b/common/rc @@ -2216,10 +2216,13 @@ _require_xfs_io_command() # check that kernel and filesystem support direct I/O _require_odirect() { - if [ $FSTYP = "ext4" ] ; then + if [ $FSTYP = "ext4" ] || [ $FSTYP = "f2fs" ] ; then if echo "$MOUNT_OPTIONS" | grep -q "test_dummy_encryption"; then - _notrun "ext4 encryption doesn't support O_DIRECT" - elif echo "$MOUNT_OPTIONS" | grep -q "data=journal"; then + _notrun "$FSTYP encryption doesn't support O_DIRECT" + fi + fi + if [ $FSTYP = "ext4" ] ; then + if echo "$MOUNT_OPTIONS" | grep -q "data=journal"; then _notrun "ext4 data journaling doesn't support O_DIRECT" fi fi -- 2.24.0.rc0.303.g954a862665-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2174CA9EAF for ; Thu, 24 Oct 2019 20:47:12 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 99BF520578; Thu, 24 Oct 2019 20:47:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="LzqOl7Y3"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="AtU4VHEf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="BFsIDGH6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99BF520578 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1iNk0l-0000VA-Pd; Thu, 24 Oct 2019 20:47:11 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iNk0k-0000V1-7W for linux-f2fs-devel@lists.sourceforge.net; Thu, 24 Oct 2019 20:47:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NFeOE+rLFk+Yp5PiLBN3oJPpICjLHV6n++qqL8qcqyc=; b=LzqOl7Y3mMMo+71AUyMjLz0OIK zrj8JsXr7c0/bA0y/xUzt9+jHxL3eGIhfgKzDCjch9xaa6mxIxwg3Vd+3XT4gPeEcck3+Vglyt2X6 ia3uqieON6LVoW7pLCrmDyzJeZMdWT7fIyjg7wzwsKN+lPZQZ9kADIbW9zbt5Fm3VrnM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=NFeOE+rLFk+Yp5PiLBN3oJPpICjLHV6n++qqL8qcqyc=; b=A tU4VHEfUQ8d4yI+d1xMeQ/Qppg8qkrKExcCdpGZn8efa/Vm86IcFf98/EHqs7seKcJ+fNocth6TI3 uhYEu3sQjkPnf5DEkVkjYbVeG+vKs4eBARL7cKx7l9Pz4wPgf9ZOhlG7sKzr35LEhJU6ILEawG8Eg Roaj62y7YWB4N008=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1iNk0i-002MHv-T5 for linux-f2fs-devel@lists.sourceforge.net; Thu, 24 Oct 2019 20:47:10 +0000 Received: from ebiggers-linuxstation.mtv.corp.google.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5B5CC20578; Thu, 24 Oct 2019 20:46:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571950018; bh=qG//jemOf0oV7yOFCo4p6dDb+1bp2vMf1ErKHQyQct0=; h=From:To:Cc:Subject:Date:From; b=BFsIDGH6/024dJ2xIIQ7ihyt6NIegUJ5bXhyScRWsj0UNXJZKfMNrB7tsv8pnQTWu uDl89+oVJLG33wo3AbKwcDK2LuGFuZb2LEPjjEQSQXPyhiEgJmKvedkODYJIsKglqx UiViBdydGTvrFYA50tJkpzYjndSIbYEOFwU98lzA= From: Eric Biggers To: fstests@vger.kernel.org Date: Thu, 24 Oct 2019 13:45:29 -0700 Message-Id: <20191024204529.90714-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog MIME-Version: 1.0 X-Headers-End: 1iNk0i-002MHv-T5 Subject: [f2fs-dev] [PATCH] common/rc: skip encrypted direct I/O tests on f2fs X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Eric Biggers Skip the O_DIRECT tests on f2fs when the test_dummy_encryption mount option is given, for the same reason as given for ext4 in commit 9b154b26e4a1 ("common/rc: ext4 doesn't support O_DIRECT with encryption"). Signed-off-by: Eric Biggers --- common/rc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/rc b/common/rc index cfaabf10..7c94307a 100644 --- a/common/rc +++ b/common/rc @@ -2216,10 +2216,13 @@ _require_xfs_io_command() # check that kernel and filesystem support direct I/O _require_odirect() { - if [ $FSTYP = "ext4" ] ; then + if [ $FSTYP = "ext4" ] || [ $FSTYP = "f2fs" ] ; then if echo "$MOUNT_OPTIONS" | grep -q "test_dummy_encryption"; then - _notrun "ext4 encryption doesn't support O_DIRECT" - elif echo "$MOUNT_OPTIONS" | grep -q "data=journal"; then + _notrun "$FSTYP encryption doesn't support O_DIRECT" + fi + fi + if [ $FSTYP = "ext4" ] ; then + if echo "$MOUNT_OPTIONS" | grep -q "data=journal"; then _notrun "ext4 data journaling doesn't support O_DIRECT" fi fi -- 2.24.0.rc0.303.g954a862665-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel