cleanup: rename _cleanup_fd_ to __cleanup_fd

igaw · igaw · commit 3228c78a6bff · 2026-04-14T09:59:14.000+02:00
Follow the new naming pattern of the compiler attributes which is just
__NAME. This is what the kernel is using as well.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/fabrics.c b/fabrics.c
@@ -958,7 +958,7 @@ int fabrics_config(const char *desc, int argc, char **argv)
 	}
 
 	if (update_config) {
-		_cleanup_fd_ int fd = -1;
+		__cleanup_fd int fd = -1;
 
 		fd = open(config_file, O_RDONLY, 0);
 		if (fd != -1)
diff --git a/libnvme/src/nvme/cleanup.h b/libnvme/src/nvme/cleanup.h
@@ -42,7 +42,7 @@ static inline void cleanup_fd(int *fd)
 	if (*fd >= 0)
 		close(*fd);
 }
-#define _cleanup_fd_ __cleanup(cleanup_fd)
+#define __cleanup_fd __cleanup(cleanup_fd)
 
 static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddrinfo)
 #define _cleanup_addrinfo_ __cleanup(cleanup_addrinfo)
diff --git a/libnvme/src/nvme/fabrics.c b/libnvme/src/nvme/fabrics.c
@@ -862,7 +862,7 @@ static int build_options(libnvme_host_t h, libnvme_ctrl_t c, char **argstr)
 static int __nvmf_supported_options(struct libnvme_global_ctx *ctx)
 {
 	char buf[0x1000], *options, *p, *v;
-	_cleanup_fd_ int fd = -1;
+	__cleanup_fd int fd = -1;
 	ssize_t len;
 
 	if (ctx->options)
@@ -949,7 +949,7 @@ static int __nvmf_supported_options(struct libnvme_global_ctx *ctx)
 
 static int __nvmf_add_ctrl(struct libnvme_global_ctx *ctx, const char *argstr)
 {
-	_cleanup_fd_ int fd = -1;
+	__cleanup_fd int fd = -1;
 	int ret, len = strlen(argstr);
 	char buf[0x1000], *options, *p;
 
diff --git a/libnvme/src/nvme/linux.c b/libnvme/src/nvme/linux.c
@@ -59,7 +59,7 @@
 
 static int __nvme_set_attr(const char *path, const char *value)
 {
-	_cleanup_fd_ int fd = -1;
+	__cleanup_fd int fd = -1;
 
 	fd = open(path, O_WRONLY);
 	if (fd < 0) {
@@ -763,7 +763,7 @@ static ssize_t getrandom_bytes(void *buf, size_t buflen)
 #if HAVE_SYS_RANDOM
 	result = getrandom(buf, buflen, GRND_NONBLOCK);
 #else
-	_cleanup_fd_ int fd = -1;
+	__cleanup_fd int fd = -1;
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd < 0)
@@ -1706,7 +1706,7 @@ __public int libnvme_import_tls_key(struct libnvme_global_ctx *ctx, const char *
 
 static int uuid_from_device_tree(char *system_uuid)
 {
-	_cleanup_fd_ int f = -1;
+	__cleanup_fd int f = -1;
 	ssize_t len;
 
 	f = open(libnvme_uuid_ibm_filename(), O_RDONLY);
@@ -1901,7 +1901,7 @@ __public char *libnvme_generate_hostnqn(void)
 static char *nvmf_read_file(const char *f, int len)
 {
 	char buf[len];
-	_cleanup_fd_ int fd = -1;
+	__cleanup_fd int fd = -1;
 	int ret;
 
 	fd = open(f, O_RDONLY);
diff --git a/libnvme/src/nvme/util.c b/libnvme/src/nvme/util.c
@@ -752,7 +752,7 @@ __public int libnvme_uuid_from_string(const char *str, unsigned char uuid[NVME_U
 
 __public int libnvme_random_uuid(unsigned char uuid[NVME_UUID_LEN])
 {
-	_cleanup_fd_ int f = -1;
+	__cleanup_fd int f = -1;
 	ssize_t n;
 
 	f = open("/dev/urandom", O_RDONLY);
diff --git a/nvme.c b/nvme.c
@@ -823,7 +823,7 @@ static int get_telemetry_log(int argc, char **argv, struct command *acmd,
 	__cleanup_free struct nvme_id_ctrl *id_ctrl = NULL;
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
-	_cleanup_fd_ int output = -1;
+	__cleanup_fd int output = -1;
 	int err = 0;
 	size_t total_size = 0;
 	__u8 *data_ptr = NULL;
@@ -1831,7 +1831,7 @@ static int get_boot_part_log(int argc, char **argv, struct command *acmd, struct
 	__cleanup_free __u8 *bp_log = NULL;
 	nvme_print_flags_t flags;
 	int err = -1;
-	_cleanup_fd_ int output = -1;
+	__cleanup_fd int output = -1;
 	__u32 bpsz = 0;
 
 	struct config {
@@ -2111,7 +2111,7 @@ static int io_mgmt_send(int argc, char **argv, struct command *acmd, struct plug
 
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
-	_cleanup_fd_ int dfd = STDIN_FILENO;
+	__cleanup_fd int dfd = STDIN_FILENO;
 	__cleanup_free void *buf = NULL;
 	struct libnvme_passthru_cmd cmd;
 	int err = -1;
@@ -2189,7 +2189,7 @@ static int io_mgmt_recv(int argc, char **argv, struct command *acmd, struct plug
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
 	__cleanup_free void *buf = NULL;
 	struct libnvme_passthru_cmd cmd;
-	_cleanup_fd_ int dfd = -1;
+	__cleanup_fd int dfd = -1;
 	int err = -1;
 
 	struct config {
@@ -5124,7 +5124,7 @@ static int fw_download(int argc, char **argv, struct command *acmd, struct plugi
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
 	_cleanup_huge_ struct nvme_mem_huge mh = { 0, };
-	_cleanup_fd_ int fw_fd = -1;
+	__cleanup_fd int fw_fd = -1;
 	unsigned int fw_size, pos;
 	int err;
 	struct stat sb;
@@ -6861,7 +6861,7 @@ static int set_feature(int argc, char **argv, struct command *acmd, struct plugi
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
 	__cleanup_free void *buf = NULL;
-	_cleanup_fd_ int ffd = STDIN_FILENO;
+	__cleanup_fd int ffd = STDIN_FILENO;
 	int err;
 	__u64 result;
 	nvme_print_flags_t flags;
@@ -7007,7 +7007,7 @@ static int sec_send(int argc, char **argv, struct command *acmd, struct plugin *
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
 	struct libnvme_passthru_cmd cmd;
 	__cleanup_free void *sec_buf = NULL;
-	_cleanup_fd_ int sec_fd = -1;
+	__cleanup_fd int sec_fd = -1;
 	unsigned int sec_size;
 	int err;
 	nvme_print_flags_t flags;
@@ -7120,7 +7120,7 @@ static int dir_send(int argc, char **argv, struct command *acmd, struct plugin *
 	__cleanup_free void *buf = NULL;
 	struct libnvme_passthru_cmd cmd;
 	__u32 dw12 = 0;
-	_cleanup_fd_ int ffd = STDIN_FILENO;
+	__cleanup_fd int ffd = STDIN_FILENO;
 	int err;
 
 	struct config {
@@ -8322,7 +8322,7 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
 	unsigned int logical_block_size = 0;
 	struct timeval start_time, end_time;
 	__cleanup_free void *mbuffer = NULL;
-	_cleanup_fd_ int dfd = -1, mfd = -1;
+	__cleanup_fd int dfd = -1, mfd = -1;
 	__u16 control = 0, nblocks = 0;
 	struct libnvme_passthru_cmd cmd;
 	__u8 sts = 0, pif = 0;
@@ -9274,7 +9274,7 @@ static int passthru(int argc, char **argv, bool admin,
 	_cleanup_huge_ struct nvme_mem_huge mh = { 0, };
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
-	_cleanup_fd_ int dfd = -1, mfd = -1;
+	__cleanup_fd int dfd = -1, mfd = -1;
 	int flags;
 	int mode = 0644;
 	void *data = NULL;
@@ -10426,7 +10426,7 @@ static int libnvme_mi(int argc, char **argv, __u8 admin_opcode, const char *desc
 	void *data = NULL;
 	int err = 0;
 	bool send;
-	_cleanup_fd_ int fd = -1;
+	__cleanup_fd int fd = -1;
 	int flags;
 	_cleanup_huge_ struct nvme_mem_huge mh = { 0, };
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
diff --git a/plugins/feat/feat-nvme.c b/plugins/feat/feat-nvme.c
@@ -174,7 +174,7 @@ static int perfc_set(struct libnvme_transport_handle *hdl, __u8 fid, __u32 cdw11
 	__u64 result;
 	int err;
 
-	_cleanup_fd_ int ffd = STDIN_FILENO;
+	__cleanup_fd int ffd = STDIN_FILENO;
 
 	struct nvme_perf_characteristics data = {
 		.attr_buf = { 0 },
diff --git a/plugins/ocp/ocp-nvme.c b/plugins/ocp/ocp-nvme.c
@@ -1280,7 +1280,7 @@ static int get_c9_log_page_data(struct libnvme_transport_handle *hdl,
 	__le64 vu_event_str_table_ofst = 0;
 	__le64 ascii_table_ofst = 0;
 
-	_cleanup_fd_ int fd = STDIN_FILENO;
+	__cleanup_fd int fd = STDIN_FILENO;
 
 	header_data = (__u8 *)malloc(sizeof(__u8) * C9_TELEMETRY_STR_LOG_LEN);
 	if (!header_data) {
@@ -2713,7 +2713,7 @@ static int get_error_injection(int argc, char **argv, struct command *acmd, stru
 static int error_injection_set(struct libnvme_transport_handle *hdl, struct erri_config *cfg, bool uuid, __u32 nsid)
 {
 	__cleanup_free struct erri_entry *entry = NULL;
-	_cleanup_fd_ int ffd = -1;
+	__cleanup_fd int ffd = -1;
 	__u32 data_len;
 	__u8 uidx = 0;
 	int err;
diff --git a/plugins/solidigm/solidigm-internal-logs.c b/plugins/solidigm/solidigm-internal-logs.c
@@ -465,7 +465,7 @@ struct log {
 static int log_save(struct log *log, const char *parent_dir_name, const char *subdir_name,
 		    const char *file_name, __u8 *buffer, size_t buf_size)
 {
-	_cleanup_fd_ int output = -1;
+	__cleanup_fd int output = -1;
 	__cleanup_free char *file_path = NULL;
 	size_t bytes_remaining = 0;
 
diff --git a/util/cleanup.h b/util/cleanup.h
@@ -34,7 +34,7 @@ static inline void cleanup_fd(int *fd)
 	if (*fd > STDERR_FILENO)
 		close(*fd);
 }
-#define _cleanup_fd_ __cleanup(cleanup_fd)
+#define __cleanup_fd __cleanup(cleanup_fd)
 
 static inline void cleanup_nvme_global_ctx(struct libnvme_global_ctx **ctx)
 {

Original file line number	Diff line number	Diff line change
`@@ -958,7 +958,7 @@ int fabrics_config(const char desc, int argc, char *argv)`
`958`	`958`	`}`
`959`	`959`
`960`	`960`	`if (update_config) {`
`961`		`- _cleanup_fd_ int fd = -1;`
	`961`	`+ __cleanup_fd int fd = -1;`
`962`	`962`
`963`	`963`	`fd = open(config_file, O_RDONLY, 0);`
`964`	`964`	`if (fd != -1)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ static inline void cleanup_fd(int *fd)`
`42`	`42`	`if (*fd >= 0)`
`43`	`43`	`close(*fd);`
`44`	`44`	`}`
`45`		`-#define _cleanup_fd_ __cleanup(cleanup_fd)`
	`45`	`+#define __cleanup_fd __cleanup(cleanup_fd)`
`46`	`46`
`47`	`47`	`static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddrinfo)`
`48`	`48`	`#define _cleanup_addrinfo_ __cleanup(cleanup_addrinfo)`
Original file line number	Diff line number	Diff line change
`@@ -862,7 +862,7 @@ static int build_options(libnvme_host_t h, libnvme_ctrl_t c, char **argstr)`
`862`	`862`	`static int __nvmf_supported_options(struct libnvme_global_ctx *ctx)`
`863`	`863`	`{`
`864`	`864`	`char buf[0x1000], options, p, *v;`
`865`		`- _cleanup_fd_ int fd = -1;`
	`865`	`+ __cleanup_fd int fd = -1;`
`866`	`866`	`ssize_t len;`
`867`	`867`
`868`	`868`	`if (ctx->options)`
`@@ -949,7 +949,7 @@ static int __nvmf_supported_options(struct libnvme_global_ctx *ctx)`
`949`	`949`
`950`	`950`	`static int __nvmf_add_ctrl(struct libnvme_global_ctx ctx, const char argstr)`
`951`	`951`	`{`
`952`		`- _cleanup_fd_ int fd = -1;`
	`952`	`+ __cleanup_fd int fd = -1;`
`953`	`953`	`int ret, len = strlen(argstr);`
`954`	`954`	`char buf[0x1000], options, p;`
`955`	`955`
Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,7 @@ __public int libnvme_uuid_from_string(const char *str, unsigned char uuid[NVME_U`
`752`	`752`
`753`	`753`	`__public int libnvme_random_uuid(unsigned char uuid[NVME_UUID_LEN])`
`754`	`754`	`{`
`755`		`- _cleanup_fd_ int f = -1;`
	`755`	`+ __cleanup_fd int f = -1;`
`756`	`756`	`ssize_t n;`
`757`	`757`
`758`	`758`	`f = open("/dev/urandom", O_RDONLY);`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ struct log {`
`465`	`465`	`static int log_save(struct log log, const char parent_dir_name, const char *subdir_name,`
`466`	`466`	`const char file_name, __u8 buffer, size_t buf_size)`
`467`	`467`	`{`
`468`		`- _cleanup_fd_ int output = -1;`
	`468`	`+ __cleanup_fd int output = -1;`
`469`	`469`	`__cleanup_free char *file_path = NULL;`
`470`	`470`	`size_t bytes_remaining = 0;`
`471`	`471`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ static inline void cleanup_fd(int *fd)`
`34`	`34`	`if (*fd > STDERR_FILENO)`
`35`	`35`	`close(*fd);`
`36`	`36`	`}`
`37`		`-#define _cleanup_fd_ __cleanup(cleanup_fd)`
	`37`	`+#define __cleanup_fd __cleanup(cleanup_fd)`
`38`	`38`
`39`	`39`	`static inline void cleanup_nvme_global_ctx(struct libnvme_global_ctx **ctx)`
`40`	`40`	`{`