[PATCH] zram-swap: remove the compression streams settings
Rui Salvaterra
rsalvaterra at gmail.com
Mon Oct 19 14:21:13 EDT 2020
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 at gmail.com>
---
package/system/zram-swap/files/zram.init | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init
index a42f019d92..98e99c0219 100755
--- a/package/system/zram-swap/files/zram.init
+++ b/package/system/zram-swap/files/zram.init
@@ -98,19 +98,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. at 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()
{
@@ -122,7 +109,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"
@@ -180,7 +166,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"
--
2.28.0
More information about the openwrt-devel
mailing list