From: Rui Salvaterra <rsalvaterra@gmail.com>
Date: Mon, 19 Oct 2020 18:21:13 +0000 (+0100)
Subject: zram-swap: remove the compression streams settings
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=116191eddf9d8ddba61de788824dea442b265936;p=openwrt%2Fstaging%2Fynezz.git

zram-swap: remove the compression streams settings

Zram switched to per-cpu compression streams since Linux 4.7 [1]. Drop the
irrelevant configuration (no-op).

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/block/zram?h=v4.7&id=43209ea2d17aae1540d4e28274e36404f72702f2

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
---

diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init
index c6b7ae89c2..685648aae5 100755
--- a/package/system/zram-swap/files/zram.init
+++ b/package/system/zram-swap/files/zram.init
@@ -97,19 +97,6 @@ zram_comp_algo()
 	fi
 }
 
-zram_comp_streams()
-{
-	local dev="$1"
-	local logical_cpus=$( grep -ci "^processor" /proc/cpuinfo )
-	[ $logical_cpus -gt 1 ] || return 1
-	local zram_comp_streams="$( uci -q get system.@system[0].zram_comp_streams )"
-	[ -n "$zram_comp_streams" ] && [ "$zram_comp_streams" -le "$logical_cpus" ] || zram_comp_streams=$logical_cpus
-	if [ -e /sys/block/$( basename $dev )/max_comp_streams ]; then
-		logger -s -t zram_comp_streams -p daemon.debug "Set max compression streams to '$zram_comp_streams' for zram '$dev'"
-		echo $zram_comp_streams > /sys/block/$( basename $dev )/max_comp_streams
-	fi
-}
-
 #print various stats info about zram swap device
 zram_stats()
 {
@@ -121,7 +108,6 @@ zram_stats()
 	printf "%-25s - %s\n" "Block device" $zdev
 	awk '{ printf "%-25s - %d MiB\n", "Device size", $1/1024/1024 }' <$zdev/disksize
 	printf "%-25s - %s\n" "Compression algo" "$(cat $zdev/comp_algorithm)"
-	printf "%-25s - %s\n" "Compression streams" "$( cat $zdev/max_comp_streams)"
 
 	awk 'BEGIN { fmt = "%-25s - %.2f %s\n"
 		fmt2 = "%-25s - %d\n"
@@ -179,7 +165,6 @@ start()
 
 	zram_reset "$zram_dev" "enforcing defaults"
 	zram_comp_algo "$zram_dev"
-	zram_comp_streams "$zram_dev"
 	echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename "$zram_dev" )/disksize"
 	/sbin/mkswap "$zram_dev"
 	/sbin/swapon -d $zram_priority "$zram_dev"