Skip to contentSkip to conversation

fanotify14: Revert broken flag support check

PATCH In review Martin Doucha 4 participants 4 messages Nov 15, 2023 – Nov 21, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fanotify14: Revert broken flag support check

Reverts part of 35f77e75 which obviously doesn't belong in a memcontrol test patch.

---
 testcases/kernel/syscalls/fanotify/fanotify14.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify14.c +1 -2
index 908a6638a..0bb789188 100644
@@ -246,8 +246,7 @@ static void do_test(unsigned int number)
 	tst_res(TINFO, "Test case %d: fanotify_init(%s, O_RDONLY)", number,
 		tc->init.desc);
 
-	//if (tc->init.flags & ~supported_init_flags) {
-	if (tc->init.flags == supported_init_flags) {
+	if (tc->init.flags & ~supported_init_flags) {
 		tst_res(TCONF, "Unsupported init flags");
 		return;
 	}
Signature · 5 lines
2.42.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by on v1 1/1
#1 lore raw

Hi,
that change was definitely not part of the memcontrol-related patch I sent to this mailinglist.

I think this change was part of another patchset I sent to the list. However, this patchset definitely didn't contain out-commented code so someone was editing it before pushing. When I remember correctly, I only changed the flags as it was suggested to me as a review comment (and I personally wouldn't have done this change in the first place).

So I'm fine with reverting the change.

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw
In reply to Martin Doucha

[cc Petr]

Quoted 29 lines · Martin Doucha

Reverts part of 35f77e75 which obviously doesn't belong in a memcontrol test patch.

---
 testcases/kernel/syscalls/fanotify/fanotify14.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify14.c +1 -3
index 908a6638a..0bb789188 100644
@@ -246,8 +246,7 @@ static void do_test(unsigned int number)
        tst_res(TINFO, "Test case %d: fanotify_init(%s, O_RDONLY)", number,
                tc->init.desc);
 
-       //if (tc->init.flags & ~supported_init_flags) {
-       if (tc->init.flags == supported_init_flags) {
+       if (tc->init.flags & ~supported_init_flags) {
                tst_res(TCONF, "Unsupported init flags");
                return;
        }
--

2.42.1

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

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw

Hi all,

Quoted 1 line

[cc Petr]

Amir, thanks for ping me.

Quoted 4 lines · Martin Doucha
Quoted 3 lines

Reverts part of 35f77e75 which obviously doesn't belong in a memcontrol test patch.

I'm very sorry, my fault. Merged.

Kind regards,
Petr

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp