From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v1 2/4] syscalls/ioctl_loop02: Using LOOP_CONFIGURE to set read_only
Date: Wed, 8 Jul 2020 15:15:51 +0200 [thread overview]
Message-ID: <20200708131551.GA7276@yuki.lan> (raw)
In-Reply-To: <1591871716-21250-3-git-send-email-xuyang2018.jy@cn.fujitsu.com>
Hi!
Pushed with a few fixed, thanks.
* Shortened some overly long messages
* Fixed the code not to leak open file descriptors
- removed useless open of file_fd in setup
- moved TCONF check in run before fds are opened
- added close for file_fd at the end of the run
(this fixes runs with -i N especially on older kernels)
diff --git a/testcases/kernel/syscalls/ioctl/ioctl_loop02.c b/testcases/kernel/syscalls/ioctl/ioctl_loop02.c
index 549154fa1..3a03d052a 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl_loop02.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl_loop02.c
@@ -35,7 +35,7 @@ static struct tcase {
char *message;
} tcases[] = {
{O_RDONLY, LOOP_SET_FD, "Using LOOP_SET_FD to setup loopdevice"},
- {O_RDWR, LOOP_CONFIGURE, "Using LOOP_CONFIGURE with read_only flag to setup loopdevice"},
+ {O_RDWR, LOOP_CONFIGURE, "Using LOOP_CONFIGURE with read_only flag"},
};
static void verify_ioctl_loop(unsigned int n)
@@ -43,6 +43,11 @@ static void verify_ioctl_loop(unsigned int n)
struct tcase *tc = &tcases[n];
struct loop_info loopinfoget;
+ if (tc->ioctl == LOOP_CONFIGURE && !loop_configure_sup) {
+ tst_res(TCONF, "LOOP_CONFIGURE ioctl not supported");
+ return;
+ }
+
tst_res(TINFO, "%s", tc->message);
file_fd = SAFE_OPEN("test.img", tc->mode);
dev_fd = SAFE_OPEN(dev_path, O_RDWR);
@@ -50,11 +55,6 @@ static void verify_ioctl_loop(unsigned int n)
if (tc->ioctl == LOOP_SET_FD) {
SAFE_IOCTL(dev_fd, LOOP_SET_FD, file_fd);
} else {
- if (!loop_configure_sup) {
- tst_res(TCONF,
- "Current environmet doesn't support LOOP_CONFIGURE ioctl, skip this");
- return;
- }
loopconfig.fd = file_fd;
SAFE_IOCTL(dev_fd, LOOP_CONFIGURE, &loopconfig);
}
@@ -98,6 +98,7 @@ static void verify_ioctl_loop(unsigned int n)
}
SAFE_CLOSE(dev_fd);
+ SAFE_CLOSE(file_fd);
tst_detach_device(dev_path);
attach_flag = 0;
}
@@ -123,7 +124,6 @@ static void setup(void)
free(tmpdir);
- file_fd = SAFE_OPEN("test.img", O_RDONLY);
file_change_fd = SAFE_OPEN("test1.img", O_RDWR);
file_fd_invalid = SAFE_OPEN("test2.img", O_RDWR);
--
Cyril Hrubis
chrubis@suse.cz
next prev parent reply other threads:[~2020-07-08 13:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 10:35 [LTP] [PATCH v1 0/4] *** Add LOOP_CONFIGURE ioctl test *** Yang Xu
2020-06-11 10:35 ` [LTP] [PATCH v1 1/4] lapi: Add fallback for LOOP_CONFIGURE ioctl and struct loop_config Yang Xu
2020-07-08 13:18 ` Cyril Hrubis
2020-06-11 10:35 ` [LTP] [PATCH v1 2/4] syscalls/ioctl_loop02: Using LOOP_CONFIGURE to set read_only Yang Xu
2020-07-08 13:15 ` Cyril Hrubis [this message]
2020-06-11 10:35 ` [LTP] [PATCH v1 3/4] syscalls/ioctl_loop08: Add LOOP_CONFIGURE error test with invalid block size Yang Xu
2020-07-08 14:00 ` Cyril Hrubis
2020-06-11 10:35 ` [LTP] [PATCH v1 4/4] syscalls/ioctl_loop09: Add LOOP_CONFIGURE ioctl test with direct I/O flag Yang Xu
2020-07-08 14:00 ` Cyril Hrubis
2020-07-10 6:39 ` [LTP] [PATCH v2 1/2] syscalls/ioctl_loop06: Using LOOP_CONFIGURE to test invalid block size Yang Xu
2020-07-10 6:39 ` [LTP] [PATCH v2 2/2] syscalls/ioctl_loop05: Using LOOP_CONFIGURE to set direct io Yang Xu
2020-07-30 7:28 ` Yang Xu
2020-07-22 9:45 ` [LTP] [PATCH v2 1/2] syscalls/ioctl_loop06: Using LOOP_CONFIGURE to test invalid block size Cyril Hrubis
2020-07-22 10:15 ` Yang Xu
2020-07-22 12:59 ` Cyril Hrubis
2020-07-23 9:41 ` Yang Xu
2020-07-24 2:05 ` [LTP] [PATCH v3 " Yang Xu
2020-07-24 2:05 ` [LTP] [PATCH v3 2/2] syscalls/ioctl_loop05: Using LOOP_CONFIGURE to set direct io Yang Xu
2020-07-29 11:39 ` Cyril Hrubis
2020-07-30 8:49 ` Yang Xu
2020-07-30 9:28 ` Cyril Hrubis
2020-07-30 10:08 ` Yang Xu
2020-07-30 10:38 ` Cyril Hrubis
2020-07-29 12:58 ` Cyril Hrubis
2020-07-29 10:07 ` [LTP] [PATCH v3 1/2] syscalls/ioctl_loop06: Using LOOP_CONFIGURE to test invalid block size Cyril Hrubis
2020-07-29 10:43 ` Yang Xu
2020-07-31 14:15 ` Cyril Hrubis
2020-07-06 1:45 ` [LTP] [PATCH v1 0/4] *** Add LOOP_CONFIGURE ioctl test *** Yang Xu
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=20200708131551.GA7276@yuki.lan \
--to=chrubis@suse.cz \
--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