Skip to contentSkip to conversation

syscalls/fanotify09: Note backport of commit e730558adffb

RFC PATCH In review cel--- via ltp 2 participants 3 messages Aug 31, 2024 – Sep 3, 2024 Stable branch

lore
Share & tools
lore

cel--- via ltp

author
#0 lore raw

RFC PATCH 1/1 syscalls/fanotify09: Note backport of commit e730558adffb

From: Chuck Lever <[email protected]>

I backported commit e730558adffb ("fsnotify: consistent behavior for parent not watching children") to v5.15.y and v5.10.y. Update fanotify09 to test older LTS kernels containing that commit.

Suggested-by Amir Goldstein <[email protected]>
Signed-off-by Chuck Lever <[email protected]>
---
 testcases/kernel/syscalls/fanotify/fanotify09.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Untested.

testcases/kernel/syscalls/fanotify/fanotify09.c +3 -3
index f61c4e45a88c..48b198b9415a 100644
@@ -29,7 +29,6 @@
  *      7372e79c9eb9 fanotify: fix logic of reporting name info with watched parent
  *
  * Test cases #6-#7 are regression tests for commit:
- * (from v5.19, unlikely to be backported thus not in .tags):
  *
  *      e730558adffb fanotify: consistent behavior for parent not watching children
  */

@@ -380,9 +379,9 @@ static void test_fanotify(unsigned int n)
 		return;
 	}
 
-	if (tc->ignore && tst_kvercmp(5, 19, 0) < 0) {
+	if (tc->ignore && tst_kvercmp(5, 10, 0) < 0) {
 		tst_res(TCONF, "ignored mask on parent dir has undefined "
-				"behavior on kernel < 5.19");
+				"behavior on kernel < 5.10");
 		return;
 	}
 

@@ -520,6 +519,7 @@ static struct tst_test test = {
 		{"linux-git", "b469e7e47c8a"},
 		{"linux-git", "55bf882c7f13"},
 		{"linux-git", "7372e79c9eb9"},
+		{"linux-git", "e730558adffb"},
 		{}
 	}
 };
Signature · 1 line
2.46.0
Reviewed-by on v1 1/1
#1 lore raw

Hi Chuck, Amir, all,

[ Add some enterprise folks just to notify ]

Quoted 1 line

From: Chuck Lever <[email protected]>

Thanks for the fix!

Quoted 6 lines

I backported commit e730558adffb ("fsnotify: consistent behavior for parent not watching children") to v5.15.y and v5.10.y. Update fanotify09 to test older LTS kernels containing that commit.

Suggested-by Amir Goldstein <[email protected]>
Signed-off-by Chuck Lever <[email protected]>

For others, suggested here:
https://lore.kernel.org/all/CAOQ4uxiUwSiRQ9tLPw6FPDB05rRLFdjxruFM4Lk=HcZfP2tfqA@mail.gmail.com/

Reviewed-by Petr Vorel <[email protected]>

NOTE: we might need to add check for enterprise kernels, but that should be trivial. I'll test it on Monday on SLES and maybe add follow up for it.

Kind regards,
Petr

Quoted 38 lines
---
 testcases/kernel/syscalls/fanotify/fanotify09.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Untested.

testcases/kernel/syscalls/fanotify/fanotify09.c +3 -3
index f61c4e45a88c..48b198b9415a 100644
@@ -29,7 +29,6 @@
  *      7372e79c9eb9 fanotify: fix logic of reporting name info with watched parent
  *
  * Test cases #6-#7 are regression tests for commit:
- * (from v5.19, unlikely to be backported thus not in .tags):
  *
  *      e730558adffb fanotify: consistent behavior for parent not watching children
  */

@@ -380,9 +379,9 @@ static void test_fanotify(unsigned int n)
 		return;
 	}
 
-	if (tc->ignore && tst_kvercmp(5, 19, 0) < 0) {
+	if (tc->ignore && tst_kvercmp(5, 10, 0) < 0) {
 		tst_res(TCONF, "ignored mask on parent dir has undefined "
-				"behavior on kernel < 5.19");
+				"behavior on kernel < 5.10");
 		return;
 	}
 

@@ -520,6 +519,7 @@ static struct tst_test test = {
 		{"linux-git", "b469e7e47c8a"},
 		{"linux-git", "55bf882c7f13"},
 		{"linux-git", "7372e79c9eb9"},
+		{"linux-git", "e730558adffb"},
 		{}
 	}
 };