From: Emil Muratov <gpm@hotplug.ru>
Date: Wed, 1 Aug 2018 21:18:45 +0000 (+0300)
Subject: zram-swap: fix zram dev reset for multicore cpu devices
X-Git-Tag: v18.06.2~106
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9a5509736a8e58d294f0d977a619cd8940845453;p=oweals%2Fopenwrt.git

zram-swap: fix zram dev reset for multicore cpu devices

 * "zram stop" could reset up to $(num_of_cores) zram devices even if
   some of those were not mounted as swap dev's. This fix tries to
   enumerate mounted swap zram dev's before making a reset

 * remove hot-added zram devs on stop (except zram0)

Signed-off-by: Emil Muratov <gpm@hotplug.ru>
(backported from 9edc1fe8abac6638cd05640279bc741a23b8d260)
---

diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init
index 419221b1a3..1eba3f4d98 100644
--- a/package/system/zram-swap/files/zram.init
+++ b/package/system/zram-swap/files/zram.init
@@ -133,18 +133,16 @@ start()
 
 stop()
 {
-	local zram_dev proc_entry
-
-	for core in $( list_cpu_idx ); do {
-		zram_dev="$( zram_dev "$core" )"
-		proc_entry="/sys/block/$( basename "$zram_dev" )/reset"
-
-		grep -sq ^"$zram_dev " /proc/swaps && {
-			logger -s -t zram_stop -p daemon.debug "deactivate swap $zram_dev"
-			swapoff "$zram_dev"
-		}
-
-		zram_reset "$zram_dev" "claiming memory back"
+	local zram_dev
+
+	for zram_dev in $( grep zram /proc/swaps |awk '{print $1}' ); do {
+		logger -s -t zram_stop -p daemon.debug "deactivate swap $zram_dev"
+		swapoff "$zram_dev" && zram_reset "$zram_dev" "claiming memory back"
+		local dev_index="$( echo $zram_dev | grep -o "[0-9]*$" )"
+		if [ $dev_index -ne 0 ]; then
+			logger -s -t zram_stop -p daemon.debug "removing zram $zram_dev"
+			echo $dev_index > /sys/class/zram-control/hot_remove
+		fi
 	} done
 }