[LTP] [PATCH v1] zram03: unload zram when it is loaded during test run

[LTP] [PATCH v1] zram03: unload zram when it is loaded during test run

[Xiao Liang]

Signed-off-by: Xiao Liang <xiliang@redhat.com>
---
 testcases/kernel/device-drivers/zram/zram03.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/testcases/kernel/device-drivers/zram/zram03.c b/testcases/kernel/device-drivers/zram/zram03.c
index b9867a573..98eb61e1c 100644
--- a/testcases/kernel/device-drivers/zram/zram03.c
+++ b/testcases/kernel/device-drivers/zram/zram03.c
@@ -187,16 +187,15 @@ static void setup(void)
 
 	 /* zram module was built in or being used on old kernel */
 	SAFE_CMD(cmd_modprobe, NULL, NULL);
-	if (access(ZRAM_CONTROL_PATH, F_OK)) {
-		file = SAFE_FOPEN("/proc/modules", "r");
-		while (fgets(line, sizeof(line), file)) {
-			if (strstr(line, "zram")) {
-				modprobe = 1;
-				break;
-			}
+	file = SAFE_FOPEN("/proc/modules", "r");
+	while (fgets(line, sizeof(line), file)) {
+		if (strstr(line, "zram")) {
+			modprobe = 1;
+			break;
 		}
-		SAFE_FCLOSE(file);
-
+	}
+	SAFE_FCLOSE(file);
+	if (access(ZRAM_CONTROL_PATH, F_OK)) {
 		if (modprobe) {
 			tst_res(TINFO,
 				"rmmod zram before test on old kernel without zram-control interface");
-- 
2.37.2


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v1] zram03: unload zram when it is loaded during test run

[Petr Vorel]

Hi Xiao,

Reviewed-by: Petr Vorel <pvorel@suse.cz>

Indeed, test does not unload zram on older kernels without zram-control
interface. Good catch!

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v1] zram03: unload zram when it is loaded during test run

[Petr Vorel]

Hi Xiao,

> Indeed, test does not unload zram on older kernels without zram-control
> interface. Good catch!
I was wrong, for both cases the module was kept even not loaded before.
Anyway merged, thanks for your fix!

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v1] zram03: unload zram when it is loaded during test run

[Frank Liang]

[-- Attachment #1.1: Type: text/plain, Size: 350 bytes --]

Thanks, Petr

Rgs,
Frank

On Mon, Sep 5, 2022 at 6:16 PM Petr Vorel <pvorel@suse.cz> wrote:

> Hi Xiao,
>
> > Indeed, test does not unload zram on older kernels without zram-control
> > interface. Good catch!
> I was wrong, for both cases the module was kept even not loaded before.
> Anyway merged, thanks for your fix!
>
> Kind regards,
> Petr
>
>

[-- Attachment #1.2: Type: text/html, Size: 695 bytes --]

[-- Attachment #2: Type: text/plain, Size: 60 bytes --]


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp