include blkzoned.h in platform_defs.h

We'll need to conditionally add definitions added in later version of
blkzoned.h soon.  The right place for that is platform_defs.h, which
means blkzoned.h needs to be included there for cpp trickery to work.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>

diff --git a/include/platform_defs.h b/include/platform_defs.h
index da966490b0f5c6f26e55fb090f70fa2e2b39dac4..1152f0622ccf43a1894c5addeadb1a0aace27763 100644 (file)
--- a/include/platform_defs.h
+++ b/include/platform_defs.h
@@ -24,6 +24,7 @@
 #include <stdbool.h>
 #include <libgen.h>
 #include <urcu.h>
+#include <linux/blkzoned.h>
 
 /* long and pointer must be either 32 bit or 64 bit */
 #define BITS_PER_LONG (sizeof(long) * CHAR_BIT)

diff --git a/libxfs/xfs_zones.c b/libxfs/xfs_zones.c
index 7a81d83f5b3ef7d6f464fb686e980b636b066c7b..c1ad7075329c0ac65334f9dd4fa6902c31bad43a 100644 (file)
--- a/libxfs/xfs_zones.c
+++ b/libxfs/xfs_zones.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2023-2025 Christoph Hellwig.
  * Copyright (c) 2024-2025, Western Digital Corporation or its affiliates.
  */
-#include <linux/blkzoned.h>
 #include "libxfs_priv.h"
 #include "xfs.h"
 #include "xfs_fs.h"

diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 90908fe0ff6c2cb8c8fdb855eacaec6e0681044f..8858026c87dc974a9c33f987d736f2d22a223136 100644 (file)
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -8,7 +8,6 @@
 #include "xfs_metadump.h"
 #include <libfrog/platform.h>
 #include "libfrog/div64.h"
-#include <linux/blkzoned.h>
 
 union mdrestore_headers {
        __be32                          magic;

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index f539c91db251fdcb61c5bcccbec4a595c61fadd1..be8e6a9c3392bfd802ac4a0a06095d4717986429 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -6,7 +6,6 @@
 #include "libfrog/util.h"
 #include "libxfs.h"
 #include <ctype.h>
-#include <linux/blkzoned.h>
 #include "libxfs/xfs_zones.h"
 #include "xfs_multidisk.h"
 #include "libxcmd.h"

diff --git a/repair/zoned.c b/repair/zoned.c
index 206b0158f95f847023f9c9e11734b223ca2f3873..49cc43984883dcf30389407db060471ab585cfec 100644 (file)
--- a/repair/zoned.c
+++ b/repair/zoned.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2024 Christoph Hellwig.
  */
 #include <ctype.h>
-#include <linux/blkzoned.h>
 #include "libxfs_priv.h"
 #include "libxfs.h"
 #include "xfs_zones.h"