From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 281D218C030; Fri, 25 Oct 2024 06:14:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729836873; cv=none; b=loz1p3xAcG2/EVZZMQ27xj3ihcjLBKgsv7zsZznbE/saGUrBAne90HhOpkEVwFTHvUOLTMbYhbIovIloJeMH1PCVPcD1ZnvQnk+Zv+N2UnIsvRL5z7h/18w0GIpNGF/97xCThAeYQFNlx8F0SZkLpj65zjS2FrKlI1pHQQUeHDA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729836873; c=relaxed/simple; bh=wfUcXHOgNass5v+8c+o0WW2F6o84R/4QtiEUjf1nQjk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=BCMf/b3Cx2/iwepzKNygZ1hrtQp6ED9HGZzxLSWb1IaZ36eV9N1sVfcLZDlwPIksDTyn3JqadYZNpLvQSo2y0uKcnn7td+VicWNwINPKJLSbvGguZjpWhVba/wllL49DDncj8o4HtzHubG+jK52vYO3ot7Xw9ueWXMwmFt8Uxmo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=q5p+CpPF; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="q5p+CpPF" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49P3eIIm024270; Fri, 25 Oct 2024 06:14:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=LDBhRM WIdzmqPqOYLaqbfkeBk9/3PuFh/BgcYTnwWJY=; b=q5p+CpPFy0gFLpyw2aKwCj zfVOtLjP8fgJ08EO2SOhHb7zWraDfWb4+n13H334iYAwBCFPK1UDcHxlAc7roP6s u+0EIrOT56KEwryNXohBbU/obeW+fdA3r4dp35RLpz39F4POCwIoE4wvnDs9dNK0 q9gnuUHXnoMXdW0+z9v3bQrRxiEM3Q4GLjNv3D1A3wgFgtjH4GS64Gqe5+huXsp2 vRpoJObtdKPJtkJF9rlH2Vh3L4Tnx/gBLYfLRkUXG7TtWMx5DV+NnPAQgmpjExtn 8L7d5sEvKfMCRYNE6JlbtqNDZQpz/yLJhXJOiYY9HKasqcI4WgOlJNiqd1SdFR9Q == Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42emaf4dc3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Oct 2024 06:14:26 +0000 (GMT) Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 49P6EQK0010575; Fri, 25 Oct 2024 06:14:26 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42emaf4dc2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Oct 2024 06:14:25 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49P67xnS014571; Fri, 25 Oct 2024 06:14:25 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 42emk8494j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Oct 2024 06:14:25 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49P6ENri49742114 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 25 Oct 2024 06:14:23 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 39D852004E; Fri, 25 Oct 2024 06:14:23 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F90B20040; Fri, 25 Oct 2024 06:14:21 +0000 (GMT) Received: from [9.39.27.196] (unknown [9.39.27.196]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 25 Oct 2024 06:14:21 +0000 (GMT) Message-ID: <7c01d820-276e-4149-b85d-809dc00d9405@linux.ibm.com> Date: Fri, 25 Oct 2024 11:44:20 +0530 Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] common/xfs,xfs/207: Adding a common helper function to check xflag bits on a given file Content-Language: en-US To: Zorro Lang Cc: fstests@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, ritesh.list@gmail.com, ojaswin@linux.ibm.com, djwong@kernel.org, zlang@kernel.org References: <6ba7f682af7e0bc99a8baeccc0d7aa4e5062a433.1729624806.git.nirjhar@linux.ibm.com> <20241025025651.okneano7d324nl4e@dell-per750-06-vm-08.rhts.eng.pek2.redhat.com> From: Nirjhar Roy In-Reply-To: <20241025025651.okneano7d324nl4e@dell-per750-06-vm-08.rhts.eng.pek2.redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: bF4mMLWo7zIClIpev8noP_2VKO6Ob6Q2 X-Proofpoint-ORIG-GUID: nsxKICHX5qRUXiiAFbDGfj-KIoB9A61R X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 phishscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 priorityscore=1501 suspectscore=0 clxscore=1015 impostorscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410250044 On 10/25/24 08:26, Zorro Lang wrote: > On Wed, Oct 23, 2024 at 12:56:19AM +0530, Nirjhar Roy wrote: >> This patch defines a common helper function to test whether any of >> fsxattr xflags field is set or not. We will use this helper in the next >> patch for checking extsize (e) flag. >> >> Reviewed-by: Ritesh Harjani (IBM) >> Reviewed-by: Ojaswin Mujoo >> Signed-off-by: Nirjhar Roy >> --- >> common/xfs | 9 +++++++++ >> tests/xfs/207 | 14 +++----------- >> 2 files changed, 12 insertions(+), 11 deletions(-) >> >> diff --git a/common/xfs b/common/xfs >> index 62e3100e..7340ccbf 100644 >> --- a/common/xfs >> +++ b/common/xfs >> @@ -13,6 +13,15 @@ __generate_xfs_report_vars() { >> REPORT_ENV_LIST_OPT+=("TEST_XFS_REPAIR_REBUILD" "TEST_XFS_SCRUB_REBUILD") >> } >> >> +# Check whether a fsxattr xflags character field is set on a given file. > Better to explain the arguments, e.g. > > # Check whether a fsxattr xflags character ($2) field is set on a given file ($1). Noted. > >> +# e.g. fsxattr.xflags = 0x0 [--------------C-] >> +# Returns 0 if passed flag character is set, otherwise returns 1 >> +_test_xfs_xflags_field() >> +{ >> + $XFS_IO_PROG -c "stat" "$1" | grep "fsxattr.xflags" | grep -q "\[.*$2.*\]" \ >> + && return 0 || return 1 > That's too complex. Those "return" aren't needed as Darrick metioned. About > that two "grep", how about combine them, e.g. > > _test_xfs_xflags_field() > { > grep -q "fsxattr.xflags.*\[.*$2.*\]" <($XFS_IO_PROG -c "stat" "$1") > } > Yes. This looks better. Thank you for the suggestion. > >> +} >> + >> _setup_large_xfs_fs() >> { >> fs_size=$1 >> diff --git a/tests/xfs/207 b/tests/xfs/207 >> index bbe21307..adb925df 100755 >> --- a/tests/xfs/207 >> +++ b/tests/xfs/207 >> @@ -15,21 +15,13 @@ _begin_fstest auto quick clone fiemap >> # Import common functions. >> . ./common/filter >> . ./common/reflink >> +. ./common/xfs > Is this really necessary? Will this test fail without this line? > The common/$FSTYP file is imported automatically, if it's not, that a bug. > > Thanks, > Zorro No, actually, it isn't. I have verified. Also, I am moving the helper function to common/rc, so this will not be required anyway. > >> >> _require_scratch_reflink >> _require_cp_reflink >> _require_xfs_io_command "fiemap" >> _require_xfs_io_command "cowextsize" >> >> -# Takes the fsxattr.xflags line, >> -# i.e. fsxattr.xflags = 0x0 [--------------C-] >> -# and tests whether a flag character is set >> -test_xflag() >> -{ >> - local flg=$1 >> - grep -q "\[.*${flg}.*\]" && echo "$flg flag set" || echo "$flg flag unset" >> -} >> - >> echo "Format and mount" >> _scratch_mkfs > $seqres.full 2>&1 >> _scratch_mount >> $seqres.full 2>&1 >> @@ -65,14 +57,14 @@ echo "Set cowextsize and check flag" >> $XFS_IO_PROG -c "cowextsize 1048576" $testdir/file3 | _filter_scratch >> _scratch_cycle_mount >> >> -$XFS_IO_PROG -c "stat" $testdir/file3 | grep 'fsxattr.xflags' | test_xflag "C" >> +_test_xfs_xflags_field "$testdir/file3" "C" && echo "C flag set" || echo "C flag unset" >> $XFS_IO_PROG -c "cowextsize" $testdir/file3 | _filter_scratch >> >> echo "Unset cowextsize and check flag" >> $XFS_IO_PROG -c "cowextsize 0" $testdir/file3 | _filter_scratch >> _scratch_cycle_mount >> >> -$XFS_IO_PROG -c "stat" $testdir/file3 | grep 'fsxattr.xflags' | test_xflag "C" >> +_test_xfs_xflags_field "$testdir/file3" "C" && echo "C flag set" || echo "C flag unset" >> $XFS_IO_PROG -c "cowextsize" $testdir/file3 | _filter_scratch >> >> status=0 >> -- >> 2.43.5 >> >> -- --- Nirjhar Roy Linux Kernel Developer IBM, Bangalore