Removed public libnvme_fstat.

Only lib-windows.c and ocp-nvme.c used libnvme_fstat, and ocp-nvme.c was easily refactored to use the existing libnvme_transport_handle_is_blkdev check instead.
- Refactored ocp-nvme.c to not need libnvme_fsat
- Removed public libnvme_fstat
- Made implementation in lib-windows.c private and renamed.

Author: bgoing-micron-oss

libnvme/src/libnvme.ld

@@ -38,7 +38,6 @@ LIBNVME_3 {
 		libnvme_free_nbft;
 		libnvme_free_ns;
 		libnvme_free_subsystem;
-		libnvme_fstat;
 		libnvme_gen_dhchap_key;
 		libnvme_generate_hostid;
 		libnvme_generate_hostnqn;

libnvme/src/nvme/lib-windows.c

@@ -11,7 +11,80 @@
 #include "compiler-attributes.h"
 
 
-static int __nvme_transport_handle_open_direct(struct libnvme_transport_handle *hdl, const char *name)
+/* fstat implementation for device HANDLE */
+static int __libnvme_fd_fstat(libnvme_fd_t fd, struct stat *buf)
+{
+	BY_HANDLE_FILE_INFORMATION file_info;
+	ULARGE_INTEGER ull;
+	DWORD file_type;
+
+	if (!buf) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	/* Check for invalid handle */
+	if (fd == INVALID_HANDLE_VALUE || fd == NULL) {
+		errno = EBADF;
+		return -1;
+	}
+
+	/*
+	 * GetFileInformationByHandle() does not work for all device HANDLEs
+	 * (e.g. raw \\\\.\\PhysicalDriveN). For those, fall back to file type.
+	 */
+	if (!GetFileInformationByHandle(fd, &file_info)) {
+		file_type = GetFileType(fd);
+		if (file_type == FILE_TYPE_DISK || file_type == FILE_TYPE_CHAR) {
+			memset(buf, 0, sizeof(*buf));
+			buf->st_mode = S_IFBLK | 0600;
+			buf->st_nlink = 1;
+			return 0;
+		}
+
+		errno = EBADF;
+		return -1;
+	}
+
+	/* Fill in the stat structure */
+	memset(buf, 0, sizeof(*buf));
+
+	/* Convert Windows file attributes to stat mode */
+	if (file_info.dwFileAttributes & FILE_ATTRIBUTE_DEVICE)
+		/* Windows device files should be marked as block devices */
+		/* This is used by libnvme_verify_chr to check device type */
+		buf->st_mode = S_IFBLK | 0600;
+	else if (file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+		buf->st_mode = S_IFDIR | 0755;
+	else
+		buf->st_mode = S_IFREG | 0644;
+
+	/* File size */
+	buf->st_size = (((off_t)file_info.nFileSizeHigh << 32)
+					| file_info.nFileSizeLow);
+
+	/* Number of hard links */
+	buf->st_nlink = file_info.nNumberOfLinks;
+
+	/* Convert FILETIME to time_t for timestamps */
+	/* Windows FILETIME is 100-nanosecond intervals since Jan 1, 1601 */
+	/* Unix time_t is seconds since Jan 1, 1970 */
+	ull.LowPart = file_info.ftLastWriteTime.dwLowDateTime;
+	ull.HighPart = file_info.ftLastWriteTime.dwHighDateTime;
+	buf->st_mtime = (time_t)((ull.QuadPart / 10000000ULL) - 11644473600ULL);
+
+	ull.LowPart = file_info.ftLastAccessTime.dwLowDateTime;
+	ull.HighPart = file_info.ftLastAccessTime.dwHighDateTime;
+	buf->st_atime = (time_t)((ull.QuadPart / 10000000ULL) - 11644473600ULL);
+
+	ull.LowPart = file_info.ftCreationTime.dwLowDateTime;
+	ull.HighPart = file_info.ftCreationTime.dwHighDateTime;
+	buf->st_ctime = (time_t)((ull.QuadPart / 10000000ULL) - 11644473600ULL);
+
+	return 0;
+}
+
+static int __libnvme_transport_handle_open_direct(struct libnvme_transport_handle *hdl, const char *name)
 {
 	char device_path[MAX_PATH];
 	HANDLE h;
@@ -53,7 +126,7 @@ static int __nvme_transport_handle_open_direct(struct libnvme_transport_handle *
 
 	hdl->fd = h;
 
-	libnvme_fstat(hdl->fd, &hdl->stat);
+	__libnvme_fd_fstat(hdl->fd, &hdl->stat);
 
 	/* Windows doesn't distinguish 32/64-bit ioctl, assume 64-bit capable */
 	hdl->ioctl_admin64 = true;
@@ -96,7 +169,7 @@ __public int libnvme_open(struct libnvme_global_ctx *ctx, const char *name,
 		libnvme_close(hdl);
 		return -ENOTSUP;
 	} else {
-		ret = __nvme_transport_handle_open_direct(hdl, name);
+		ret = __libnvme_transport_handle_open_direct(hdl, name);
 	}
 
 	if (ret) {
@@ -132,76 +205,3 @@ __public void libnvme_close(struct libnvme_transport_handle *hdl)
 		break;
 	}
 }
-
-/* Platform-specific fstat wrapper for libnvme_fd_t */
-__public int libnvme_fstat(libnvme_fd_t fd, struct stat *buf)
-{
-	BY_HANDLE_FILE_INFORMATION file_info;
-	ULARGE_INTEGER ull;
-	DWORD file_type;
-
-	if (!buf) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	/* Check for invalid handle */
-	if (fd == INVALID_HANDLE_VALUE || fd == NULL) {
-		errno = EBADF;
-		return -1;
-	}
-
-	/*
-	 * GetFileInformationByHandle() does not work for all device HANDLEs
-	 * (e.g. raw \\\\.\\PhysicalDriveN). For those, fall back to file type.
-	 */
-	if (!GetFileInformationByHandle(fd, &file_info)) {
-		file_type = GetFileType(fd);
-		if (file_type == FILE_TYPE_DISK || file_type == FILE_TYPE_CHAR) {
-			memset(buf, 0, sizeof(*buf));
-			buf->st_mode = S_IFBLK | 0600;
-			buf->st_nlink = 1;
-			return 0;
-		}
-
-		errno = EBADF;
-		return -1;
-	}
-
-	/* Fill in the stat structure */
-	memset(buf, 0, sizeof(*buf));
-
-	/* Convert Windows file attributes to stat mode */
-	if (file_info.dwFileAttributes & FILE_ATTRIBUTE_DEVICE)
-		/* Windows device files should be marked as block devices */
-		/* This is used by libnvme_verify_chr to check device type */
-		buf->st_mode = S_IFBLK | 0600;
-	else if (file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-		buf->st_mode = S_IFDIR | 0755;
-	else
-		buf->st_mode = S_IFREG | 0644;
-
-	/* File size */
-	buf->st_size = (((off_t)file_info.nFileSizeHigh << 32)
-					| file_info.nFileSizeLow);
-
-	/* Number of hard links */
-	buf->st_nlink = file_info.nNumberOfLinks;
-
-	/* Convert FILETIME to time_t for timestamps */
-	/* Windows FILETIME is 100-nanosecond intervals since Jan 1, 1601 */
-	/* Unix time_t is seconds since Jan 1, 1970 */
-	ull.LowPart = file_info.ftLastWriteTime.dwLowDateTime;
-	ull.HighPart = file_info.ftLastWriteTime.dwHighDateTime;
-	buf->st_mtime = (time_t)((ull.QuadPart / 10000000ULL) - 11644473600ULL);
-
-	ull.LowPart = file_info.ftLastAccessTime.dwLowDateTime;
-	ull.HighPart = file_info.ftLastAccessTime.dwHighDateTime;
-	buf->st_atime = (time_t)((ull.QuadPart / 10000000ULL) - 11644473600ULL);
-
-	ull.LowPart = file_info.ftCreationTime.dwLowDateTime;
-	ull.HighPart = file_info.ftCreationTime.dwHighDateTime;
-	buf->st_ctime = (time_t)((ull.QuadPart / 10000000ULL) - 11644473600ULL);
-
-	return 0;
-}

libnvme/src/platform/linux.h

@@ -40,12 +40,6 @@ typedef int libnvme_fd_t;
 #define O_BINARY 0
 #endif
 
-/* Platform-specific fstat wrapper for libnvme_fd_t */
-static inline int libnvme_fstat(libnvme_fd_t fd, struct stat *buf)
-{
-	return fstat(fd, buf);
-}
-
 /* Platform initialization - no-op on Linux */
 static inline void libnvme_init(void) {}
 

libnvme/src/platform/windows.h

@@ -220,9 +220,6 @@ static inline int sigaction(int signum, const struct sigaction *act,
 /* _mkdir is defined in <direct.h> */
 #define mkdir(path, mode) _mkdir(path)
 
-/* Platform-specific fstat wrapper for libnvme_fd_t */
-int libnvme_fstat(libnvme_fd_t fd, struct stat *buf);
-
 
 /* mman.h memory mapping stubs - not supported on Windows */
 

plugins/ocp/ocp-nvme.c

@@ -349,11 +349,7 @@ int ocp_set_latency_monitor_feature(int argc, char **argv, struct command *acmd,
 	if (err)
 		return err;
 
-	err = libnvme_fstat(libnvme_transport_handle_get_fd(hdl), &nvme_stat);
-	if (err < 0)
-		return err;
-
-	if (S_ISBLK(nvme_stat.st_mode)) {
+	if (libnvme_transport_handle_is_blkdev(hdl)) {
 		err = libnvme_get_nsid(hdl, &nsid);
 		if (err < 0) {
 			perror("invalid-namespace-id");
@@ -1463,11 +1459,7 @@ static int ocp_telemetry_log(int argc, char **argv, struct command *acmd, struct
 	if (opt.telemetry_type == 0)
 		opt.telemetry_type = "host";
 
-	err = libnvme_fstat(libnvme_transport_handle_get_fd(hdl), &nvme_stat);
-	if (err < 0)
-		return err;
-
-	if (S_ISBLK(nvme_stat.st_mode)) {
+	if (libnvme_transport_handle_is_blkdev(hdl)) {
 		err = libnvme_get_nsid(hdl, &nsid);
 		if (err < 0)
 			return err;