[PATCH 2/2] btrfs/091: remove noinode_cache option

[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]



inode cache feature has been removed

Link: https://www.spinics.net/lists/linux-btrfs/msg107910.html
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Ma Xinjian <xinjianx.ma@xxxxxxxxx>
---
 tests/btrfs/091 | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/tests/btrfs/091 b/tests/btrfs/091
index 307289b1..f2cd00b2 100755
--- a/tests/btrfs/091
+++ b/tests/btrfs/091
@@ -23,21 +23,12 @@ _require_cp_reflink
 # use largest node/leaf size (64K) to allow the test to be run on arch with
 # page size > 4k.
 NODESIZE=65536
-SUPPORT_NOINODE_CACHE="yes"
 
 run_check _scratch_mkfs "--nodesize $NODESIZE"
 
-# inode cache will also take space in fs tree, disable them to get consistent
-# result.
 # discard error output since we will check return value manually.
 # also disable all compression, or output will mismatch with golden output
-_try_scratch_mount "-o noinode_cache,compress=no,compress-force=no" 2> /dev/null
-
-# Check for old kernel which doesn't support 'noinode_cache' mount option
-if [ $? -ne 0 ]; then
-	support_noinode_cache="no"
-	_scratch_mount
-fi
+_try_scratch_mount "-o compress=no,compress-force=no" 2> /dev/null
 
 _run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv1
 _run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv2
@@ -46,16 +37,6 @@ _run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv3
 _run_btrfs_util_prog quota enable $SCRATCH_MNT
 _run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
 
-# if we don't support noinode_cache mount option, then we should double check
-# whether inode cache is enabled before executing the real test payload.
-if [ $SUPPORT_NOINODE_CACHE == "no" ]; then
-	EMPTY_SIZE=`$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | \
-		$SED_PROG -n '/[0-9]/p' | $AWK_PROG '{print $2}' | head -n1`
-	if [ $EMPTY_SIZE != $NODESIZE ]; then
-		_notrun "Kernel doesn't support to disable inode cache"
-	fi
-fi
-
 $XFS_IO_PROG -f -c "pwrite 0 256K" $SCRATCH_MNT/subv1/file1 | _filter_xfs_io
 cp --reflink $SCRATCH_MNT/subv1/file1 $SCRATCH_MNT/subv2/file1
 cp --reflink $SCRATCH_MNT/subv1/file1 $SCRATCH_MNT/subv3/file1
-- 
2.20.1




[Index of Archives]     [Linux Filesystems Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux