[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/

[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/

[Conrad Kostecki]

commit:     a5c1c77702d036ff2884a9fa27ceccbd646e2619
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Aug 28 19:26:07 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 22:40:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c1c777

sys-block/fio: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22144
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-block/fio/files/fio-3.20-fno-common.patch | 51 ---------------------------
 1 file changed, 51 deletions(-)

diff --git a/sys-block/fio/files/fio-3.20-fno-common.patch b/sys-block/fio/files/fio-3.20-fno-common.patch
deleted file mode 100644
index f7306bd6a09..00000000000
--- a/sys-block/fio/files/fio-3.20-fno-common.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 63a4b9cca4ba3aa4101051402cbbe946ced17a49 Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@kernel.dk>
-Date: Tue, 2 Jun 2020 08:20:03 -0600
-Subject: [PATCH] gfio: don't have multiple versions of main_ui
-
-Also comment a fall-through case appropriately, so newer GCC
-don't warn.
-
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
----
- gfio.c | 4 +++-
- gfio.h | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/gfio.c b/gfio.c
-index 280539685..734651b67 100644
---- a/gfio.c
-+++ b/gfio.c
-@@ -38,6 +38,8 @@
- #include "gclient.h"
- #include "graph.h"
- 
-+struct gui main_ui;
-+
- static bool gfio_server_running;
- static unsigned int gfio_graph_limit = 100;
- 
-@@ -223,7 +225,7 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
- 	switch (ge->state) {
- 	default:
- 		gfio_report_error(ge, "Bad client state: %u\n", ge->state);
--		/* fall through to new state */
-+		/* fall-through */
- 	case GE_STATE_NEW:
- 		connect_state = 1;
- 		edit_state = 1;
-diff --git a/gfio.h b/gfio.h
-index aa14e3c7d..2bf0ea242 100644
---- a/gfio.h
-+++ b/gfio.h
-@@ -78,7 +78,9 @@ struct gui {
- 	int handler_running;
- 
- 	GHashTable *ge_hash;
--} main_ui;
-+};
-+
-+extern struct gui main_ui;
- 
- enum {
- 	GE_STATE_NEW = 1,

[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/

[Conrad Kostecki]

commit:     21b4a301e4b96183e863908b1383f2eea0890858
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Oct 31 18:49:31 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 12:05:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b4a301

sys-block/fio: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-block/fio/files/fio-3.27-drop-raw.patch | 118 ----------------------------
 1 file changed, 118 deletions(-)

diff --git a/sys-block/fio/files/fio-3.27-drop-raw.patch b/sys-block/fio/files/fio-3.27-drop-raw.patch
deleted file mode 100644
index 1c9f8671d12e..000000000000
--- a/sys-block/fio/files/fio-3.27-drop-raw.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-https://github.com/axboe/fio/commit/382975557e632efb506836bc1709789e615c9094.patch
-
-Fixes build with >=sys-kernel/linux-headers-5.14.
-
-From: Eric Sandeen <esandeen@redhat.com>
-Date: Tue, 3 Aug 2021 10:23:35 -0700
-Subject: [PATCH] fio: remove raw device support
-
-As of Linux kernel commit 603e4922f1c ("remove the raw driver"),
-linux/raw.h is gone, and raw device support no longer exists.
-Because of this, fio can no longer build against the current Linux
-kernel headers.
-
-So, remove raw device support from fio as well.
-
-Signed-off-by: Eric Sandeen <sandeen@redhat.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
---- a/diskutil.c
-+++ b/diskutil.c
-@@ -166,14 +166,10 @@ static int get_device_numbers(char *file_name, int *maj, int *min)
- 		if (S_ISBLK(st.st_mode)) {
- 			majdev = major(st.st_rdev);
- 			mindev = minor(st.st_rdev);
--		} else if (S_ISCHR(st.st_mode)) {
--			majdev = major(st.st_rdev);
--			mindev = minor(st.st_rdev);
--			if (fio_lookup_raw(st.st_rdev, &majdev, &mindev))
--				return -1;
--		} else if (S_ISFIFO(st.st_mode))
-+		} else if (S_ISCHR(st.st_mode) ||
-+			   S_ISFIFO(st.st_mode)) {
- 			return -1;
--		else {
-+		} else {
- 			majdev = major(st.st_dev);
- 			mindev = minor(st.st_dev);
- 		}
---- a/fio.1
-+++ b/fio.1
-@@ -1700,9 +1700,7 @@ Sets size to something really large and waits for ENOSPC (no space left on
- device) or EDQUOT (disk quota exceeded)
- as the terminating condition. Only makes sense with sequential
- write. For a read workload, the mount point will be filled first then I/O
--started on the result. This option doesn't make sense if operating on a raw
--device node, since the size of that is already known by the file system.
--Additionally, writing beyond end-of-device will not return ENOSPC there.
-+started on the result.
- .SS "I/O engine"
- .TP
- .BI ioengine \fR=\fPstr
---- a/os/os-linux.h
-+++ b/os/os-linux.h
-@@ -14,7 +14,6 @@
- #include <errno.h>
- #include <sched.h>
- #include <linux/unistd.h>
--#include <linux/raw.h>
- #include <linux/major.h>
- #include <linux/fs.h>
- #include <scsi/sg.h>
-@@ -41,7 +40,6 @@
- #define FIO_HAVE_IOSCHED_SWITCH
- #define FIO_HAVE_ODIRECT
- #define FIO_HAVE_HUGETLB
--#define FIO_HAVE_RAWBIND
- #define FIO_HAVE_BLKTRACE
- #define FIO_HAVE_CL_SIZE
- #define FIO_HAVE_CGROUPS
-@@ -178,36 +176,6 @@ static inline unsigned long long os_phys_mem(void)
- 	return (unsigned long long) pages * (unsigned long long) pagesize;
- }
- 
--static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
--{
--	struct raw_config_request rq;
--	int fd;
--
--	if (major(dev) != RAW_MAJOR)
--		return 1;
--
--	/*
--	 * we should be able to find /dev/rawctl or /dev/raw/rawctl
--	 */
--	fd = open("/dev/rawctl", O_RDONLY);
--	if (fd < 0) {
--		fd = open("/dev/raw/rawctl", O_RDONLY);
--		if (fd < 0)
--			return 1;
--	}
--
--	rq.raw_minor = minor(dev);
--	if (ioctl(fd, RAW_GETBIND, &rq) < 0) {
--		close(fd);
--		return 1;
--	}
--
--	close(fd);
--	*majdev = rq.block_major;
--	*mindev = rq.block_minor;
--	return 0;
--}
--
- #ifdef O_NOATIME
- #define FIO_O_NOATIME	O_NOATIME
- #else
---- a/os/os.h
-+++ b/os/os.h
-@@ -157,10 +157,6 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu);
- #define OS_RAND_MAX			RAND_MAX
- #endif
- 
--#ifndef FIO_HAVE_RAWBIND
--#define fio_lookup_raw(dev, majdev, mindev)	1
--#endif
--
- #ifndef FIO_PREFERRED_ENGINE
- #define FIO_PREFERRED_ENGINE	"psync"
- #endif