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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1CC6C28CF5 for ; Wed, 26 Jan 2022 06:13:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235221AbiAZGNt (ORCPT ); Wed, 26 Jan 2022 01:13:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43350 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229772AbiAZGNs (ORCPT ); Wed, 26 Jan 2022 01:13:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643177628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=TF0FaFoejbH4+YEixXMu4kt3Mg7d0J4mQPXJu5XxpTg=; b=b+Ne0TdeDvJ7B7G3HTw3iB0ClHXY603xOMmBhMS9CiHkjvJW8lxhoASDtAKP5OlttU8q4x /DcLJKQoWXdgrdnyDPk9ygkDUTrjUoLAdHoIwDa/tu+UEPxpxxcprOKNZtnzEj/CMTMKwZ Kr/dBGkYOt3zVt8pvNARENV7Tl5hMQg= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292-IWaPQdjyPLaG1I8xPmmscg-1; Wed, 26 Jan 2022 01:13:46 -0500 X-MC-Unique: IWaPQdjyPLaG1I8xPmmscg-1 Received: by mail-qv1-f71.google.com with SMTP id r12-20020a0562140c8c00b004226c4fc035so11983474qvr.4 for ; Tue, 25 Jan 2022 22:13:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=TF0FaFoejbH4+YEixXMu4kt3Mg7d0J4mQPXJu5XxpTg=; b=4+NUCvkMXyuTWaknjPuOgjH7zzN+bIwjVx+lL/rx6wik1g3oSKSvlha95tP9zoHKgO LDEeIQpaSp66j7L3LjXjiyjr0iN2+H3I0CnQdrKWDRagYT2a3vOfY4+rRyUOi1e1VhGw UIJj6bri6B0h2x1V5qvscNKLiM3MhPhWBV0CpvuD0bczHmrA8q/jxbiUk0ijoE5fR5gO ULBrAjteB8LVaK+dC7gfNF9LMi6yx12CFE89NDmgzvT0a2TOX3zlDB4SDO0PTKgEKMhE 3EnNkxwhH0QV+/U1DjBhbCkYFUY39YfRCbnj6N9AjzFIL3fQbf2tKwLNuoXzxpRaV1zO ZqcA== X-Gm-Message-State: AOAM532ynqaFjczs2uJ1Zo/wj5r/x4jmmYW0tgQ6qPJRZVs8zz3oYQSc 0K0c1K1fDgxc1RvTTf22bnbreYCI+205scP5DwagQNZBrTmAOi7fn2WsHFiv1JD9I04Thl5YIq+ mxsbFGpAEAusRFde9E8tB X-Received: by 2002:a05:6214:2a87:: with SMTP id jr7mr22419169qvb.56.1643177625785; Tue, 25 Jan 2022 22:13:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJzW/KPfKWKt3Qd/NQfa+oPNjey3THWJBwhkcIXAGZhxRidV5MSaJsZZZxB8WsdjmRjSnvyKtA== X-Received: by 2002:a05:6214:2a87:: with SMTP id jr7mr22419158qvb.56.1643177625575; Tue, 25 Jan 2022 22:13:45 -0800 (PST) Received: from zlang-mailbox ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id f9sm8660379qkp.94.2022.01.25.22.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jan 2022 22:13:45 -0800 (PST) Date: Wed, 26 Jan 2022 14:13:38 +0800 From: Zorro Lang To: "Darrick J. Wong" Cc: guaneryu@gmail.com, linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Subject: Re: [PATCH 2/2] fstests: skip tests that require XFS_IOC_ALLOCSP Message-ID: <20220126061338.emwff4usc2pm4fua@zlang-mailbox> Mail-Followup-To: "Darrick J. Wong" , guaneryu@gmail.com, linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me References: <164316310323.2594527.8578672050751235563.stgit@magnolia> <164316311463.2594527.15258066711888915917.stgit@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <164316311463.2594527.15258066711888915917.stgit@magnolia> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Tue, Jan 25, 2022 at 06:11:54PM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong > > Deprecating this, so turn off the tests that require it. > > Signed-off-by: Darrick J. Wong > --- Looks good to me, Reviewed-by: Zorro Lang > common/rc | 4 ++-- > ltp/fsstress.c | 4 ++++ > tests/xfs/107 | 1 + > 3 files changed, 7 insertions(+), 2 deletions(-) > > > diff --git a/common/rc b/common/rc > index b3289de9..6a0648ad 100644 > --- a/common/rc > +++ b/common/rc > @@ -2507,8 +2507,8 @@ _require_xfs_io_command() > rm -f $testcopy > /dev/null 2>&1 > param_checked="$param" > ;; > - "falloc" ) > - testio=`$XFS_IO_PROG -F -f -c "falloc $param 0 1m" $testfile 2>&1` > + "falloc"|"allocsp") > + testio=`$XFS_IO_PROG -F -f -c "$command $param 0 1m" $testfile 2>&1` > param_checked="$param" > ;; > "fpunch" | "fcollapse" | "zero" | "fzero" | "finsert" | "funshare") > diff --git a/ltp/fsstress.c b/ltp/fsstress.c > index 5f3126e6..23188467 100644 > --- a/ltp/fsstress.c > +++ b/ltp/fsstress.c > @@ -2045,6 +2045,7 @@ afsync_f(opnum_t opno, long r) > void > allocsp_f(opnum_t opno, long r) > { > +#ifdef XFS_IOC_ALLOCSP64 > int e; > pathname_t f; > int fd; > @@ -2094,6 +2095,7 @@ allocsp_f(opnum_t opno, long r) > } > free_pathname(&f); > close(fd); > +#endif > } > > #ifdef AIO > @@ -3733,6 +3735,7 @@ fiemap_f(opnum_t opno, long r) > void > freesp_f(opnum_t opno, long r) > { > +#ifdef XFS_IOC_FREESP64 > int e; > pathname_t f; > int fd; > @@ -3781,6 +3784,7 @@ freesp_f(opnum_t opno, long r) > procid, opno, f.path, st, (long long)off, e); > free_pathname(&f); > close(fd); > +#endif > } > > void > diff --git a/tests/xfs/107 b/tests/xfs/107 > index 577094b2..1ea9c492 100755 > --- a/tests/xfs/107 > +++ b/tests/xfs/107 > @@ -20,6 +20,7 @@ _begin_fstest auto quick prealloc > _supported_fs xfs > _require_test > _require_scratch > +_require_xfs_io_command allocsp # detect presence of ALLOCSP ioctl > _require_test_program allocstale > > # Create a 256MB filesystem to avoid running into mkfs problems with too-small >