public inbox for ltp@lists.linux.it
 help / color / mirror / Atom feed
From: Andrea Cervesato <andrea.cervesato@suse.de>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] Fix unlink09 test
Date: Tue, 04 Jun 2024 15:44:40 +0200	[thread overview]
Message-ID: <20240604-unlink09-v1-1-dfd8e3e1cb2b@suse.com> (raw)

From: Andrea Cervesato <andrea.cervesato@suse.com>

This patch will fix unlink09 test by checking for filesystems which
are not supporting inode attributes.

Fixes: 2cf78f47a6 (unlink: Add error tests for EPERM and EROFS)
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
This will fix the 2cf78f47a6 and resolve issues on filesystems
which are not supporting inode attributes.
---
 testcases/kernel/syscalls/unlink/unlink09.c | 38 +++++++++++++++++++----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/testcases/kernel/syscalls/unlink/unlink09.c b/testcases/kernel/syscalls/unlink/unlink09.c
index cc4b4a07e..ed6f0adc3 100644
--- a/testcases/kernel/syscalls/unlink/unlink09.c
+++ b/testcases/kernel/syscalls/unlink/unlink09.c
@@ -11,6 +11,8 @@
  *
  * - EPERM when target file is marked as immutable or append-only
  * - EROFS when target file is on a read-only filesystem.
+ *
+ * Test won't be executed if inode attributes are not supported.
  */
 
 #include <sys/ioctl.h>
@@ -22,8 +24,8 @@
 #define DIR_EROFS "erofs"
 #define TEST_EROFS "erofs/test_erofs"
 
-static int fd_immutable;
-static int fd_append_only;
+static int fd_immutable = -1;
+static int fd_append_only = -1;
 
 static struct test_case_t {
 	char *filename;
@@ -43,12 +45,18 @@ static void setup(void)
 {
 	int attr;
 
-	fd_immutable = SAFE_OPEN(TEST_EPERM_IMMUTABLE, O_CREAT, 0600);
-	SAFE_IOCTL(fd_immutable, FS_IOC_GETFLAGS, &attr);
+	fd_immutable = SAFE_CREAT(TEST_EPERM_IMMUTABLE, 0600);
+	TEST(ioctl(fd_immutable, FS_IOC_GETFLAGS, &attr));
+
+	if (TST_RET == -1 && TST_ERR == ENOTTY) {
+		SAFE_CLOSE(fd_immutable);
+		tst_brk(TCONF | TTERRNO, "Inode attributes not supported");
+	}
+
 	attr |= FS_IMMUTABLE_FL;
 	SAFE_IOCTL(fd_immutable, FS_IOC_SETFLAGS, &attr);
 
-	fd_append_only = SAFE_OPEN(TEST_EPERM_APPEND_ONLY, O_CREAT, 0600);
+	fd_append_only = SAFE_CREAT(TEST_EPERM_APPEND_ONLY, 0600);
 	SAFE_IOCTL(fd_append_only, FS_IOC_GETFLAGS, &attr);
 	attr |= FS_APPEND_FL;
 	SAFE_IOCTL(fd_append_only, FS_IOC_SETFLAGS, &attr);
@@ -58,15 +66,19 @@ static void cleanup(void)
 {
 	int attr;
 
-	SAFE_IOCTL(fd_immutable, FS_IOC_GETFLAGS, &attr);
-	attr &= ~FS_IMMUTABLE_FL;
-	SAFE_IOCTL(fd_immutable, FS_IOC_SETFLAGS, &attr);
-	SAFE_CLOSE(fd_immutable);
+	if (fd_immutable != -1) {
+		SAFE_IOCTL(fd_immutable, FS_IOC_GETFLAGS, &attr);
+		attr &= ~FS_IMMUTABLE_FL;
+		SAFE_IOCTL(fd_immutable, FS_IOC_SETFLAGS, &attr);
+		SAFE_CLOSE(fd_immutable);
+	}
 
-	SAFE_IOCTL(fd_append_only, FS_IOC_GETFLAGS, &attr);
-	attr &= ~FS_APPEND_FL;
-	SAFE_IOCTL(fd_append_only, FS_IOC_SETFLAGS, &attr);
-	SAFE_CLOSE(fd_append_only);
+	if (fd_append_only != -1) {
+		SAFE_IOCTL(fd_append_only, FS_IOC_GETFLAGS, &attr);
+		attr &= ~FS_APPEND_FL;
+		SAFE_IOCTL(fd_append_only, FS_IOC_SETFLAGS, &attr);
+		SAFE_CLOSE(fd_append_only);
+	}
 }
 
 static void verify_unlink(unsigned int i)

---
base-commit: 66517b89141fc455ed807f3b95e5260dcf9fb90f
change-id: 20240604-unlink09-dc4802f872f9

Best regards,
-- 
Andrea Cervesato <andrea.cervesato@suse.com>


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

             reply	other threads:[~2024-06-04 13:45 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-04 13:44 Andrea Cervesato [this message]
2024-06-05  6:57 ` [LTP] [PATCH] Fix unlink09 test Petr Vorel
2024-06-05  7:38   ` Petr Vorel
2024-06-05  7:55     ` Andrea Cervesato via ltp
2024-06-05  8:04     ` Cyril Hrubis
2024-06-05 12:02     ` Martin Doucha
2024-06-05 12:11       ` Petr Vorel
2024-06-05 12:27         ` Petr Vorel
2024-06-05 12:34           ` Martin Doucha
2024-06-05 13:21             ` Petr Vorel
2024-06-05 13:44               ` Cyril Hrubis
2024-06-05 13:53                 ` Martin Doucha
2024-06-05 14:17                   ` Petr Vorel
2024-06-05 14:12                 ` Petr Vorel
2024-06-05 14:24   ` Konstantin Ryabitsev
2024-06-07  9:36     ` Petr Vorel
2024-06-05  8:11 ` Cyril Hrubis
2024-06-05 10:16   ` Andrea Cervesato via ltp
2024-06-05 11:30     ` Cyril Hrubis
2024-06-05 11:42       ` Andrea Cervesato via ltp
2024-06-05 11:53   ` Martin Doucha
2024-06-05 12:05 ` Martin Doucha
2024-06-05 12:22 ` Martin Doucha

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240604-unlink09-v1-1-dfd8e3e1cb2b@suse.com \
    --to=andrea.cervesato@suse.de \
    --cc=ltp@lists.linux.it \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox