Move get_sector_size() to the linux specific code

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/src/linux.c b/src/linux.c
index 8bc59e3..1b2a9ca 100644 (file)
--- a/src/linux.c
+++ b/src/linux.c
@@ -1202,3 +1202,22 @@ err:
                close(fd);
        return ret;
 }
+
+/************************************************************
+ * get_sector_size
+ * Requires:
+ *  - filedes is an open file descriptor, suitable for reading
+ * Modifies: nothing
+ * Returns:
+ *  sector size, or 512.
+ ************************************************************/
+int UNUSED
+get_sector_size(int filedes)
+{
+        int rc, sector_size = 512;
+
+        rc = ioctl(filedes, BLKSSZGET, &sector_size);
+        if (rc)
+                sector_size = 512;
+        return sector_size;
+}

diff --git a/src/linux.h b/src/linux.h
index dfe8aee..aa96def 100644 (file)
--- a/src/linux.h
+++ b/src/linux.h
@@ -108,6 +108,8 @@ extern int eb_nvme_ns_id(int fd, uint32_t *ns_id);
 
 extern int HIDDEN get_partition_number(const char *devpath);
 
+int UNUSED get_sector_size(int filedes);
+
 extern int HIDDEN find_parent_devpath(const char * const child,
                                       char **parent);
 

diff --git a/src/util.h b/src/util.h
index 59e54de..a4e0846 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -241,25 +241,6 @@ lcm(uint64_t x, uint64_t y)
         return (x / n) * y;
 }
 
-/************************************************************
- * get_sector_size
- * Requires:
- *  - filedes is an open file descriptor, suitable for reading
- * Modifies: nothing
- * Returns:
- *  sector size, or 512.
- ************************************************************/
-static inline int UNUSED
-get_sector_size(int filedes)
-{
-        int rc, sector_size = 512;
-
-        rc = ioctl(filedes, BLKSSZGET, &sector_size);
-        if (rc)
-                sector_size = 512;
-        return sector_size;
-}
-
 #ifndef strndupa
 #define strndupa(s, l)                                                  \
        (__extension__ ({                                                \