rename xfs.h
PATCH v2 1/1 rename xfs.h
Hi all,
currently one of the biggest difference between the kernel and xfsprogs for the shared libxfs files is that the all kernel source files first include xfs.h, while in xfsprogs they first include libxfs_priv.h. The reason for that is that there is a public xfs.h header in xfsprogs that causes a namespace collision.
This patch renames xfs.h in the kernel tree to xfs_plaform.h, a name that is still available in xfsprogs. Any other name fitting that criteria should work just as well, I'm open to better suggestion if there are any.
Diffstat:
b/fs/xfs/libxfs/xfs_ag.c | 2 - b/fs/xfs/libxfs/xfs_ag_resv.c | 2 - b/fs/xfs/libxfs/xfs_alloc.c | 2 - b/fs/xfs/libxfs/xfs_alloc_btree.c | 2 - b/fs/xfs/libxfs/xfs_attr.c | 2 - b/fs/xfs/libxfs/xfs_attr_leaf.c | 2 - b/fs/xfs/libxfs/xfs_attr_remote.c | 2 - b/fs/xfs/libxfs/xfs_bit.c | 2 - b/fs/xfs/libxfs/xfs_bmap.c | 2 - b/fs/xfs/libxfs/xfs_bmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_btree.c | 2 - b/fs/xfs/libxfs/xfs_btree_mem.c | 2 - b/fs/xfs/libxfs/xfs_btree_staging.c | 2 - b/fs/xfs/libxfs/xfs_da_btree.c | 2 - b/fs/xfs/libxfs/xfs_defer.c | 2 - b/fs/xfs/libxfs/xfs_dir2.c | 2 - b/fs/xfs/libxfs/xfs_dir2_block.c | 2 - b/fs/xfs/libxfs/xfs_dir2_data.c | 2 - b/fs/xfs/libxfs/xfs_dir2_leaf.c | 2 - b/fs/xfs/libxfs/xfs_dir2_node.c | 2 - b/fs/xfs/libxfs/xfs_dir2_sf.c | 2 - b/fs/xfs/libxfs/xfs_dquot_buf.c | 2 - b/fs/xfs/libxfs/xfs_exchmaps.c | 2 - b/fs/xfs/libxfs/xfs_group.c | 2 - b/fs/xfs/libxfs/xfs_ialloc.c | 2 - b/fs/xfs/libxfs/xfs_ialloc_btree.c | 2 - b/fs/xfs/libxfs/xfs_iext_tree.c | 2 - b/fs/xfs/libxfs/xfs_inode_buf.c | 2 - b/fs/xfs/libxfs/xfs_inode_fork.c | 2 - b/fs/xfs/libxfs/xfs_inode_util.c | 2 - b/fs/xfs/libxfs/xfs_log_rlimit.c | 2 - b/fs/xfs/libxfs/xfs_metadir.c | 2 - b/fs/xfs/libxfs/xfs_metafile.c | 2 - b/fs/xfs/libxfs/xfs_parent.c | 2 - b/fs/xfs/libxfs/xfs_refcount.c | 2 - b/fs/xfs/libxfs/xfs_refcount_btree.c | 2 - b/fs/xfs/libxfs/xfs_rmap.c | 2 - b/fs/xfs/libxfs/xfs_rmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_rtbitmap.c | 2 - b/fs/xfs/libxfs/xfs_rtgroup.c | 2 - b/fs/xfs/libxfs/xfs_rtrefcount_btree.c | 2 - b/fs/xfs/libxfs/xfs_rtrmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_sb.c | 2 - b/fs/xfs/libxfs/xfs_symlink_remote.c | 2 - b/fs/xfs/libxfs/xfs_trans_inode.c | 2 - b/fs/xfs/libxfs/xfs_trans_resv.c | 2 - b/fs/xfs/libxfs/xfs_trans_space.c | 2 - b/fs/xfs/libxfs/xfs_types.c | 2 - b/fs/xfs/libxfs/xfs_zones.c | 2 - b/fs/xfs/scrub/agb_bitmap.c | 2 - b/fs/xfs/scrub/agheader.c | 2 - b/fs/xfs/scrub/agheader_repair.c | 2 - b/fs/xfs/scrub/alloc.c | 2 - b/fs/xfs/scrub/alloc_repair.c | 2 - b/fs/xfs/scrub/attr.c | 2 - b/fs/xfs/scrub/attr_repair.c | 2 - b/fs/xfs/scrub/bitmap.c | 2 - b/fs/xfs/scrub/bmap.c | 2 - b/fs/xfs/scrub/bmap_repair.c | 2 - b/fs/xfs/scrub/btree.c | 2 - b/fs/xfs/scrub/common.c | 2 - b/fs/xfs/scrub/cow_repair.c | 2 - b/fs/xfs/scrub/dabtree.c | 2 - b/fs/xfs/scrub/dir.c | 2 - b/fs/xfs/scrub/dir_repair.c | 2 - b/fs/xfs/scrub/dirtree.c | 2 - b/fs/xfs/scrub/dirtree_repair.c | 2 - b/fs/xfs/scrub/dqiterate.c | 2 - b/fs/xfs/scrub/findparent.c | 2 - b/fs/xfs/scrub/fscounters.c | 2 - b/fs/xfs/scrub/fscounters_repair.c | 2 - b/fs/xfs/scrub/health.c | 2 - b/fs/xfs/scrub/ialloc.c | 2 - b/fs/xfs/scrub/ialloc_repair.c | 2 - b/fs/xfs/scrub/inode.c | 2 - b/fs/xfs/scrub/inode_repair.c | 2 - b/fs/xfs/scrub/iscan.c | 2 - b/fs/xfs/scrub/listxattr.c | 2 - b/fs/xfs/scrub/metapath.c | 2 - b/fs/xfs/scrub/newbt.c | 2 - b/fs/xfs/scrub/nlinks.c | 2 - b/fs/xfs/scrub/nlinks_repair.c | 2 - b/fs/xfs/scrub/orphanage.c | 2 - b/fs/xfs/scrub/parent.c | 2 - b/fs/xfs/scrub/parent_repair.c | 2 - b/fs/xfs/scrub/quota.c | 2 - b/fs/xfs/scrub/quota_repair.c | 2 - b/fs/xfs/scrub/quotacheck.c | 2 - b/fs/xfs/scrub/quotacheck_repair.c | 2 - b/fs/xfs/scrub/rcbag.c | 2 - b/fs/xfs/scrub/rcbag_btree.c | 2 - b/fs/xfs/scrub/readdir.c | 2 - b/fs/xfs/scrub/reap.c | 2 - b/fs/xfs/scrub/refcount.c | 2 - b/fs/xfs/scrub/refcount_repair.c | 2 - b/fs/xfs/scrub/repair.c | 2 - b/fs/xfs/scrub/rgsuper.c | 2 - b/fs/xfs/scrub/rmap.c | 2 - b/fs/xfs/scrub/rmap_repair.c | 2 - b/fs/xfs/scrub/rtbitmap.c | 2 - b/fs/xfs/scrub/rtbitmap_repair.c | 2 - b/fs/xfs/scrub/rtrefcount.c | 2 - b/fs/xfs/scrub/rtrefcount_repair.c | 2 - b/fs/xfs/scrub/rtrmap.c | 2 - b/fs/xfs/scrub/rtrmap_repair.c | 2 - b/fs/xfs/scrub/rtsummary.c | 2 - b/fs/xfs/scrub/rtsummary_repair.c | 2 - b/fs/xfs/scrub/scrub.c | 2 - b/fs/xfs/scrub/stats.c | 2 - b/fs/xfs/scrub/symlink.c | 2 - b/fs/xfs/scrub/symlink_repair.c | 2 - b/fs/xfs/scrub/tempfile.c | 2 - b/fs/xfs/scrub/trace.c | 2 - b/fs/xfs/scrub/xfarray.c | 2 - b/fs/xfs/scrub/xfblob.c | 2 - b/fs/xfs/scrub/xfile.c | 2 - b/fs/xfs/xfs_acl.c | 2 - b/fs/xfs/xfs_aops.c | 2 - b/fs/xfs/xfs_attr_inactive.c | 2 - b/fs/xfs/xfs_attr_item.c | 2 - b/fs/xfs/xfs_attr_list.c | 2 - b/fs/xfs/xfs_bio_io.c | 2 - b/fs/xfs/xfs_bmap_item.c | 2 - b/fs/xfs/xfs_bmap_util.c | 2 - b/fs/xfs/xfs_buf.c | 2 - b/fs/xfs/xfs_buf_item.c | 2 - b/fs/xfs/xfs_buf_item_recover.c | 2 - b/fs/xfs/xfs_buf_mem.c | 2 - b/fs/xfs/xfs_dahash_test.c | 2 - b/fs/xfs/xfs_dir2_readdir.c | 2 - b/fs/xfs/xfs_discard.c | 2 - b/fs/xfs/xfs_dquot.c | 2 - b/fs/xfs/xfs_dquot_item.c | 2 - b/fs/xfs/xfs_dquot_item_recover.c | 2 - b/fs/xfs/xfs_drain.c | 2 - b/fs/xfs/xfs_error.c | 2 - b/fs/xfs/xfs_exchmaps_item.c | 2 - b/fs/xfs/xfs_exchrange.c | 2 - b/fs/xfs/xfs_export.c | 2 - b/fs/xfs/xfs_extent_busy.c | 2 - b/fs/xfs/xfs_extfree_item.c | 2 - b/fs/xfs/xfs_file.c | 2 - b/fs/xfs/xfs_filestream.c | 2 - b/fs/xfs/xfs_fsmap.c | 2 - b/fs/xfs/xfs_fsops.c | 2 - b/fs/xfs/xfs_globals.c | 2 - b/fs/xfs/xfs_handle.c | 2 - b/fs/xfs/xfs_health.c | 2 - b/fs/xfs/xfs_hooks.c | 2 - b/fs/xfs/xfs_icache.c | 2 - b/fs/xfs/xfs_icreate_item.c | 2 - b/fs/xfs/xfs_inode.c | 2 - b/fs/xfs/xfs_inode_item.c | 2 - b/fs/xfs/xfs_inode_item_recover.c | 2 - b/fs/xfs/xfs_ioctl.c | 2 - b/fs/xfs/xfs_ioctl32.c | 2 - b/fs/xfs/xfs_iomap.c | 2 - b/fs/xfs/xfs_iops.c | 2 - b/fs/xfs/xfs_itable.c | 2 - b/fs/xfs/xfs_iunlink_item.c | 2 - b/fs/xfs/xfs_iwalk.c | 2 - b/fs/xfs/xfs_log.c | 2 - b/fs/xfs/xfs_log_cil.c | 2 - b/fs/xfs/xfs_log_recover.c | 2 - b/fs/xfs/xfs_message.c | 2 - b/fs/xfs/xfs_mount.c | 2 - b/fs/xfs/xfs_mru_cache.c | 2 - b/fs/xfs/xfs_notify_failure.c | 2 - b/fs/xfs/xfs_platform.h | 46 ++++++++++++++++++++------------- b/fs/xfs/xfs_pnfs.c | 2 - b/fs/xfs/xfs_pwork.c | 2 - b/fs/xfs/xfs_qm.c | 2 - b/fs/xfs/xfs_qm_bhv.c | 2 - b/fs/xfs/xfs_qm_syscalls.c | 2 - b/fs/xfs/xfs_quotaops.c | 2 - b/fs/xfs/xfs_refcount_item.c | 2 - b/fs/xfs/xfs_reflink.c | 2 - b/fs/xfs/xfs_rmap_item.c | 2 - b/fs/xfs/xfs_rtalloc.c | 2 - b/fs/xfs/xfs_stats.c | 2 - b/fs/xfs/xfs_super.c | 2 - b/fs/xfs/xfs_symlink.c | 2 - b/fs/xfs/xfs_sysctl.c | 2 - b/fs/xfs/xfs_sysfs.c | 2 - b/fs/xfs/xfs_trace.c | 2 - b/fs/xfs/xfs_trans.c | 2 - b/fs/xfs/xfs_trans_ail.c | 2 - b/fs/xfs/xfs_trans_buf.c | 2 - b/fs/xfs/xfs_trans_dquot.c | 2 - b/fs/xfs/xfs_xattr.c | 2 - b/fs/xfs/xfs_zone_alloc.c | 2 - b/fs/xfs/xfs_zone_gc.c | 2 - b/fs/xfs/xfs_zone_info.c | 2 - b/fs/xfs/xfs_zone_space_resv.c | 2 - fs/xfs/xfs.h | 28 -------------------- 195 files changed, 222 insertions(+), 238 deletions(-)
PATCH 1/4 xfs: rename xfs_linux.h to xfs_platform.h
Rename xfs_linux.h to prepare for including including it directly from source files including those shared with xfsprogs.
---
fs/xfs/xfs.h | 2 +-
fs/xfs/{xfs_linux.h => xfs_platform.h} | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
rename fs/xfs/{xfs_linux.h => xfs_platform.h} (98%)fs/xfs/xfs.h +1 -1
@@ -23,6 +23,6 @@#endif -#include "xfs_linux.h" +#include "xfs_platform.h" #endif /* __XFS_H__ */
fs/xfs/xfs_platform.h renamed from fs/xfs/xfs_linux.h +3 -3
@@ -3,8 +3,8 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#ifndef __XFS_LINUX__ -#define __XFS_LINUX__ +#ifndef _XFS_PLATFORM_H +#define _XFS_PLATFORM_H#include <linux/types.h> #include <linux/uuid.h>
@@ -281,4 +281,4 @@ kmem_to_page(void *addr) return virt_to_page(addr); } -#endif /* __XFS_LINUX__ */ +#endif /* _XFS_PLATFORM_H */
Signature · 1 line
2.47.3
PATCH 2/4 xfs: include global headers first in xfs_platform.h
In reply to Christoph HellwigEnsure we have all kernel headers included by the time we do our own thing, just like the rest of the tree.
--- fs/xfs/xfs_platform.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
fs/xfs/xfs_platform.h +10 -14
@@ -8,19 +8,6 @@#include <linux/types.h> #include <linux/uuid.h> - -/* -* Kernel specific type declarations for XFS -*/ - -typedef __s64 xfs_off_t ;/* <file offset> type */ -typedef unsigned long long xfs_ino_t ;/* <inode> type */ -typedef __s64 xfs_daddr_t ;/* <disk address> type */ -typedef __u32 xfs_dev_t ; -typedef __u32 xfs_nlink_t ; - -#include "xfs_types.h" -#include <linux/semaphore.h> #include <linux/mm.h> #include <linux/sched/mm.h>
@@ -63,7 +50,6 @@ typedef __u32 xfs_nlink_t;#include <linux/xattr.h> #include <linux/mnt_idmapping.h> #include <linux/debugfs.h> -#include <asm/page.h> #include <asm/div64.h> #include <asm/param.h>
@@ -71,6 +57,16 @@ typedef __u32 xfs_nlink_t;#include <asm/byteorder.h> #include <linux/unaligned.h> +/* +* Kernel specific type declarations for XFS +*/ +typedef __s64 xfs_off_t ;/* <file offset> type */ +typedef unsigned long long xfs_ino_t ;/* <inode> type */ +typedef __s64 xfs_daddr_t ;/* <disk address> type */ +typedef __u32 xfs_dev_t ; +typedef __u32 xfs_nlink_t ; + +#include "xfs_types.h" #include "xfs_fs.h" #include "xfs_stats.h" #include "xfs_sysctl.h"
Signature · 1 line
2.47.3
PATCH 3/4 xfs: move the remaining content from xfs.h to xfs_platform.h
In reply to Christoph HellwigMove the global defines from xfs.h to xfs_platform.h to prepare for removing xfs.h.
--- fs/xfs/xfs.h | 17 ----------------- fs/xfs/xfs_platform.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-)
fs/xfs/xfs.h +0 -17
@@ -6,23 +6,6 @@#ifndef __XFS_H__#define __XFS_H__ -#ifdef CONFIG_XFS_DEBUG -#define DEBUG 1 -#endif - -#ifdef CONFIG_XFS_DEBUG_EXPENSIVE -#define DEBUG_EXPENSIVE 1 -#endif - -#ifdef CONFIG_XFS_ASSERT_FATAL -#define XFS_ASSERT_FATAL 1 -#endif - -#ifdef CONFIG_XFS_WARN -#define XFS_WARN 1 -#endif - -#include "xfs_platform.h" #endif /* __XFS_H__ */
fs/xfs/xfs_platform.h +16 -0
@@ -57,6 +57,22 @@#include <asm/byteorder.h> #include <linux/unaligned.h> +#ifdef CONFIG_XFS_DEBUG +#define DEBUG 1 +#endif + +#ifdef CONFIG_XFS_DEBUG_EXPENSIVE +#define DEBUG_EXPENSIVE 1 +#endif + +#ifdef CONFIG_XFS_ASSERT_FATAL +#define XFS_ASSERT_FATAL 1 +#endif + +#ifdef CONFIG_XFS_WARN +#define XFS_WARN 1 +#endif +/* * Kernel specific type declarations for XFS */
Signature · 1 line
2.47.3
PATCH 4/4 xfs: directly include xfs_platform.h
In reply to Christoph HellwigThe xfs.h header conflicts with the public xfs.h in xfsprogs, leading to a spurious difference in all shared libxfs files that have to include libxfs_priv.h in userspace. Directly include xfs_platform.h so that we can add a header of the same name to xfsprogs and remove this major annoyance for the shared code.
--- fs/xfs/libxfs/xfs_ag.c | 2 +- fs/xfs/libxfs/xfs_ag_resv.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 2 +- fs/xfs/libxfs/xfs_alloc_btree.c | 2 +- fs/xfs/libxfs/xfs_attr.c | 2 +- fs/xfs/libxfs/xfs_attr_leaf.c | 2 +- fs/xfs/libxfs/xfs_attr_remote.c | 2 +- fs/xfs/libxfs/xfs_bit.c | 2 +- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_bmap_btree.c | 2 +- fs/xfs/libxfs/xfs_btree.c | 2 +- fs/xfs/libxfs/xfs_btree_mem.c | 2 +- fs/xfs/libxfs/xfs_btree_staging.c | 2 +- fs/xfs/libxfs/xfs_da_btree.c | 2 +- fs/xfs/libxfs/xfs_defer.c | 2 +- fs/xfs/libxfs/xfs_dir2.c | 2 +- fs/xfs/libxfs/xfs_dir2_block.c | 2 +- fs/xfs/libxfs/xfs_dir2_data.c | 2 +- fs/xfs/libxfs/xfs_dir2_leaf.c | 2 +- fs/xfs/libxfs/xfs_dir2_node.c | 2 +- fs/xfs/libxfs/xfs_dir2_sf.c | 2 +- fs/xfs/libxfs/xfs_dquot_buf.c | 2 +- fs/xfs/libxfs/xfs_exchmaps.c | 2 +- fs/xfs/libxfs/xfs_group.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- fs/xfs/libxfs/xfs_iext_tree.c | 2 +- fs/xfs/libxfs/xfs_inode_buf.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.c | 2 +- fs/xfs/libxfs/xfs_inode_util.c | 2 +- fs/xfs/libxfs/xfs_log_rlimit.c | 2 +- fs/xfs/libxfs/xfs_metadir.c | 2 +- fs/xfs/libxfs/xfs_metafile.c | 2 +- fs/xfs/libxfs/xfs_parent.c | 2 +- fs/xfs/libxfs/xfs_refcount.c | 2 +- fs/xfs/libxfs/xfs_refcount_btree.c | 2 +- fs/xfs/libxfs/xfs_rmap.c | 2 +- fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- fs/xfs/libxfs/xfs_rtgroup.c | 2 +- fs/xfs/libxfs/xfs_rtrefcount_btree.c | 2 +- fs/xfs/libxfs/xfs_rtrmap_btree.c | 2 +- fs/xfs/libxfs/xfs_sb.c | 2 +- fs/xfs/libxfs/xfs_symlink_remote.c | 2 +- fs/xfs/libxfs/xfs_trans_inode.c | 2 +- fs/xfs/libxfs/xfs_trans_resv.c | 2 +- fs/xfs/libxfs/xfs_trans_space.c | 2 +- fs/xfs/libxfs/xfs_types.c | 2 +- fs/xfs/libxfs/xfs_zones.c | 2 +- fs/xfs/scrub/agb_bitmap.c | 2 +- fs/xfs/scrub/agheader.c | 2 +- fs/xfs/scrub/agheader_repair.c | 2 +- fs/xfs/scrub/alloc.c | 2 +- fs/xfs/scrub/alloc_repair.c | 2 +- fs/xfs/scrub/attr.c | 2 +- fs/xfs/scrub/attr_repair.c | 2 +- fs/xfs/scrub/bitmap.c | 2 +- fs/xfs/scrub/bmap.c | 2 +- fs/xfs/scrub/bmap_repair.c | 2 +- fs/xfs/scrub/btree.c | 2 +- fs/xfs/scrub/common.c | 2 +- fs/xfs/scrub/cow_repair.c | 2 +- fs/xfs/scrub/dabtree.c | 2 +- fs/xfs/scrub/dir.c | 2 +- fs/xfs/scrub/dir_repair.c | 2 +- fs/xfs/scrub/dirtree.c | 2 +- fs/xfs/scrub/dirtree_repair.c | 2 +- fs/xfs/scrub/dqiterate.c | 2 +- fs/xfs/scrub/findparent.c | 2 +- fs/xfs/scrub/fscounters.c | 2 +- fs/xfs/scrub/fscounters_repair.c | 2 +- fs/xfs/scrub/health.c | 2 +- fs/xfs/scrub/ialloc.c | 2 +- fs/xfs/scrub/ialloc_repair.c | 2 +- fs/xfs/scrub/inode.c | 2 +- fs/xfs/scrub/inode_repair.c | 2 +- fs/xfs/scrub/iscan.c | 2 +- fs/xfs/scrub/listxattr.c | 2 +- fs/xfs/scrub/metapath.c | 2 +- fs/xfs/scrub/newbt.c | 2 +- fs/xfs/scrub/nlinks.c | 2 +- fs/xfs/scrub/nlinks_repair.c | 2 +- fs/xfs/scrub/orphanage.c | 2 +- fs/xfs/scrub/parent.c | 2 +- fs/xfs/scrub/parent_repair.c | 2 +- fs/xfs/scrub/quota.c | 2 +- fs/xfs/scrub/quota_repair.c | 2 +- fs/xfs/scrub/quotacheck.c | 2 +- fs/xfs/scrub/quotacheck_repair.c | 2 +- fs/xfs/scrub/rcbag.c | 2 +- fs/xfs/scrub/rcbag_btree.c | 2 +- fs/xfs/scrub/readdir.c | 2 +- fs/xfs/scrub/reap.c | 2 +- fs/xfs/scrub/refcount.c | 2 +- fs/xfs/scrub/refcount_repair.c | 2 +- fs/xfs/scrub/repair.c | 2 +- fs/xfs/scrub/rgsuper.c | 2 +- fs/xfs/scrub/rmap.c | 2 +- fs/xfs/scrub/rmap_repair.c | 2 +- fs/xfs/scrub/rtbitmap.c | 2 +- fs/xfs/scrub/rtbitmap_repair.c | 2 +- fs/xfs/scrub/rtrefcount.c | 2 +- fs/xfs/scrub/rtrefcount_repair.c | 2 +- fs/xfs/scrub/rtrmap.c | 2 +- fs/xfs/scrub/rtrmap_repair.c | 2 +- fs/xfs/scrub/rtsummary.c | 2 +- fs/xfs/scrub/rtsummary_repair.c | 2 +- fs/xfs/scrub/scrub.c | 2 +- fs/xfs/scrub/stats.c | 2 +- fs/xfs/scrub/symlink.c | 2 +- fs/xfs/scrub/symlink_repair.c | 2 +- fs/xfs/scrub/tempfile.c | 2 +- fs/xfs/scrub/trace.c | 2 +- fs/xfs/scrub/xfarray.c | 2 +- fs/xfs/scrub/xfblob.c | 2 +- fs/xfs/scrub/xfile.c | 2 +- fs/xfs/xfs.h | 11 ----------- fs/xfs/xfs_acl.c | 2 +- fs/xfs/xfs_aops.c | 2 +- fs/xfs/xfs_attr_inactive.c | 2 +- fs/xfs/xfs_attr_item.c | 2 +- fs/xfs/xfs_attr_list.c | 2 +- fs/xfs/xfs_bio_io.c | 2 +- fs/xfs/xfs_bmap_item.c | 2 +- fs/xfs/xfs_bmap_util.c | 2 +- fs/xfs/xfs_buf.c | 2 +- fs/xfs/xfs_buf_item.c | 2 +- fs/xfs/xfs_buf_item_recover.c | 2 +- fs/xfs/xfs_buf_mem.c | 2 +- fs/xfs/xfs_dahash_test.c | 2 +- fs/xfs/xfs_dir2_readdir.c | 2 +- fs/xfs/xfs_discard.c | 2 +- fs/xfs/xfs_dquot.c | 2 +- fs/xfs/xfs_dquot_item.c | 2 +- fs/xfs/xfs_dquot_item_recover.c | 2 +- fs/xfs/xfs_drain.c | 2 +- fs/xfs/xfs_error.c | 2 +- fs/xfs/xfs_exchmaps_item.c | 2 +- fs/xfs/xfs_exchrange.c | 2 +- fs/xfs/xfs_export.c | 2 +- fs/xfs/xfs_extent_busy.c | 2 +- fs/xfs/xfs_extfree_item.c | 2 +- fs/xfs/xfs_file.c | 2 +- fs/xfs/xfs_filestream.c | 2 +- fs/xfs/xfs_fsmap.c | 2 +- fs/xfs/xfs_fsops.c | 2 +- fs/xfs/xfs_globals.c | 2 +- fs/xfs/xfs_handle.c | 2 +- fs/xfs/xfs_health.c | 2 +- fs/xfs/xfs_hooks.c | 2 +- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_icreate_item.c | 2 +- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_inode_item_recover.c | 2 +- fs/xfs/xfs_ioctl.c | 2 +- fs/xfs/xfs_ioctl32.c | 2 +- fs/xfs/xfs_iomap.c | 2 +- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_iunlink_item.c | 2 +- fs/xfs/xfs_iwalk.c | 2 +- fs/xfs/xfs_log.c | 2 +- fs/xfs/xfs_log_cil.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- fs/xfs/xfs_message.c | 2 +- fs/xfs/xfs_mount.c | 2 +- fs/xfs/xfs_mru_cache.c | 2 +- fs/xfs/xfs_notify_failure.c | 2 +- fs/xfs/xfs_pnfs.c | 2 +- fs/xfs/xfs_pwork.c | 2 +- fs/xfs/xfs_qm.c | 2 +- fs/xfs/xfs_qm_bhv.c | 2 +- fs/xfs/xfs_qm_syscalls.c | 2 +- fs/xfs/xfs_quotaops.c | 2 +- fs/xfs/xfs_refcount_item.c | 2 +- fs/xfs/xfs_reflink.c | 2 +- fs/xfs/xfs_rmap_item.c | 2 +- fs/xfs/xfs_rtalloc.c | 2 +- fs/xfs/xfs_stats.c | 2 +- fs/xfs/xfs_super.c | 2 +- fs/xfs/xfs_symlink.c | 2 +- fs/xfs/xfs_sysctl.c | 2 +- fs/xfs/xfs_sysfs.c | 2 +- fs/xfs/xfs_trace.c | 2 +- fs/xfs/xfs_trans.c | 2 +- fs/xfs/xfs_trans_ail.c | 2 +- fs/xfs/xfs_trans_buf.c | 2 +- fs/xfs/xfs_trans_dquot.c | 2 +- fs/xfs/xfs_xattr.c | 2 +- fs/xfs/xfs_zone_alloc.c | 2 +- fs/xfs/xfs_zone_gc.c | 2 +- fs/xfs/xfs_zone_info.c | 2 +- fs/xfs/xfs_zone_space_resv.c | 2 +- 194 files changed, 193 insertions(+), 204 deletions(-) delete mode 100644 fs/xfs/xfs.h
fs/xfs/libxfs/xfs_ag.c +1 -1
@@ -5,7 +5,7 @@* All rights reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_ag_resv.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2016 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_alloc.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/libxfs/xfs_alloc_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_attr.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_attr_leaf.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_attr_remote.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_bit.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_log_format.h" #include "xfs_bit.h"
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_bmap_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_btree_mem.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_btree_staging.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2020 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_da_btree.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_defer.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2016 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_dir2.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_dir2_block.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_dir2_data.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_dir2_leaf.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_dir2_node.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_dir2_sf.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_dquot_buf.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_exchmaps.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_group.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018 Red Hat, Inc. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_trans_resv.h"
fs/xfs/libxfs/xfs_ialloc.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_ialloc_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_iext_tree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2017 Christoph Hellwig. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_bit.h"
fs/xfs/libxfs/xfs_inode_buf.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_inode_fork.c +1 -1
@@ -4,7 +4,7 @@* All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_inode_util.c +1 -1
@@ -4,7 +4,7 @@* All Rights Reserved. */ #include <linux/iversion.h> -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_log_rlimit.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2013 Jie Liu. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_metadir.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_metafile.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_parent.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2022-2024 Oracle. * All rights reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_da_format.h"
fs/xfs/libxfs/xfs_refcount.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2016 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_refcount_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2016 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_rmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2014 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_rmap_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2014 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_rtbitmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_rtgroup.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2022-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_rtrefcount_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_rtrmap_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_sb.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_symlink_remote.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2012-2013 Red Hat, Inc. * All rights reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/libxfs/xfs_trans_inode.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_trans_resv.c +1 -1
@@ -4,7 +4,7 @@* Copyright (C) 2010 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_trans_space.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/libxfs/xfs_types.c +1 -1
@@ -4,7 +4,7 @@* Copyright (C) 2017 Oracle. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_shared.h"
fs/xfs/libxfs/xfs_zones.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2025 Christoph Hellwig. * Copyright (c) 2024-2025, Western Digital Corporation or its affiliates. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/agb_bitmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_bit.h" #include "xfs_format.h"
fs/xfs/scrub/agheader.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/agheader_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/alloc.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/alloc_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/attr.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/attr_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/bitmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_bit.h"
fs/xfs/scrub/bmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/bmap_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/common.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/cow_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2022-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/dabtree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/dir.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/dir_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/dirtree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/dirtree_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/dqiterate.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_bit.h"
fs/xfs/scrub/findparent.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/fscounters.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2019-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/fscounters_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/health.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2019-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/ialloc.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/ialloc_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/inode.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/inode_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/iscan.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/listxattr.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2022-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/metapath.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/newbt.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2022-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/nlinks.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/nlinks_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/orphanage.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/parent.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/parent_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/quota.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_bit.h"
fs/xfs/scrub/quota_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/quotacheck.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/quotacheck_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rcbag.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2022-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rcbag_btree.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2022-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/readdir.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2022-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/reap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2022-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/refcount.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/refcount_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rgsuper.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2022-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rmap_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rtbitmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rtbitmap_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2020-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rtrefcount.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rtrefcount_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rtrmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rtrmap_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rtsummary.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/rtsummary_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/scrub.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/stats.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/symlink.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/symlink_repair.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2018-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/tempfile.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/trace.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/xfarray.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2021-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/xfblob.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2021-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/scrub/xfile.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2018-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs.h deleted +0 -11
@@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. -* All Rights Reserved. -*/ -#ifndef __XFS_H__ -#define __XFS_H__ - -#include "xfs_platform.h" - -#endif /* __XFS_H__ */
fs/xfs/xfs_acl.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2008, Christoph Hellwig * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_aops.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2016-2025 Christoph Hellwig. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_attr_inactive.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_attr_item.c +1 -1
@@ -4,7 +4,7 @@* Author: Allison Henderson <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_trans_resv.h"
fs/xfs/xfs_attr_list.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_bio_io.c +1 -1
@@ -2,7 +2,7 @@/* * Copyright (c) 2019 Christoph Hellwig. */ -#include "xfs.h" +#include "xfs_platform.h" static inline unsigned int bio_max_vecs (unsigned int count) {
fs/xfs/xfs_bmap_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2016 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_bmap_util.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2012 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_buf.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include <linux/backing-dev.h> #include <linux/dax.h>
fs/xfs/xfs_buf_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_buf_item_recover.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_buf_mem.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_buf.h" #include "xfs_buf_mem.h"
fs/xfs/xfs_dahash_test.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_dir2_readdir.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2013 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_discard.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2010, 2023 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_dquot.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2003 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_dquot_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2003 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_dquot_item_recover.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_drain.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2022-2023 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_error.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_fs.h"
fs/xfs/xfs_exchmaps_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_exchrange.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_export.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2004-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_extent_busy.c +1 -1
@@ -5,7 +5,7 @@* Copyright (c) 2011 Christoph Hellwig. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_extfree_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2001,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_file.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_filestream.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2014 Christoph Hellwig. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_fsmap.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2017 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_fsops.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_globals.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_error.h" /*
fs/xfs/xfs_handle.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2022-2024 Oracle. * All rights reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_health.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2019 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_hooks.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2022-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_icache.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_icreate_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2008-2010, 2013 Dave Chinner * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_inode.c +1 -1
@@ -5,7 +5,7 @@*/ #include <linux/iversion.h> -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_inode_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_inode_item_recover.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_ioctl.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_ioctl32.c +1 -1
@@ -5,7 +5,7 @@*/ #include <linux/mount.h> #include <linux/fsmap.h> -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_iomap.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2016-2018 Christoph Hellwig. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_iops.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_itable.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_iunlink_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2020-2022, Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_iwalk.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2019 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_log.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_log_cil.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2010 Red Hat, Inc. All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_log_recover.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_message.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2011 Red Hat, Inc. All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_error.h" #include "xfs_shared.h"
fs/xfs/xfs_mount.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_mru_cache.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2006-2007 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_mru_cache.h" /*
fs/xfs/xfs_notify_failure.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2022 Fujitsu. All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_pnfs.c +1 -1
@@ -2,7 +2,7 @@/* * Copyright (c) 2014 Christoph Hellwig. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_pwork.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2019 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_qm.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_qm_bhv.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_qm_syscalls.c +1 -1
@@ -5,7 +5,7 @@*/ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_quotaops.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2008, Christoph Hellwig * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_refcount_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2016 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_reflink.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2016 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_rmap_item.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) 2016 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_rtalloc.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_stats.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" struct xstats xfsstats;
fs/xfs/xfs_super.c +1 -1
@@ -4,7 +4,7 @@* All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_symlink.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2012-2013 Red Hat, Inc. * All rights reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_fs.h" #include "xfs_format.h"
fs/xfs/xfs_sysctl.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2001-2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_error.h" static struct ctl_table_header *xfs_table_header;
fs/xfs/xfs_sysfs.c +1 -1
@@ -4,7 +4,7 @@* All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_trace.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2009, Christoph Hellwig * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_bit.h"
fs/xfs/xfs_trans.c +1 -1
@@ -4,7 +4,7 @@* Copyright (C) 2010 Red Hat, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_trans_ail.c +1 -1
@@ -4,7 +4,7 @@* Copyright (c) 2008 Dave Chinner * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_trans_buf.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_trans_dquot.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2000-2002 Silicon Graphics, Inc. * All Rights Reserved. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h"
fs/xfs/xfs_xattr.c +1 -1
@@ -4,7 +4,7 @@* Portions Copyright (C) 2000-2008 Silicon Graphics, Inc. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_zone_alloc.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2025 Christoph Hellwig. * Copyright (c) 2024-2025, Western Digital Corporation or its affiliates. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_zone_gc.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2025 Christoph Hellwig. * Copyright (c) 2024-2025, Western Digital Corporation or its affiliates. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_log_format.h"
fs/xfs/xfs_zone_info.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2025 Christoph Hellwig. * Copyright (c) 2024-2025, Western Digital Corporation or its affiliates. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_trans_resv.h"
fs/xfs/xfs_zone_space_resv.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2023-2025 Christoph Hellwig. * Copyright (c) 2024-2025, Western Digital Corporation or its affiliates. */ -#include "xfs.h" +#include "xfs_platform.h" #include "xfs_shared.h" #include "xfs_format.h" #include "xfs_trans_resv.h"
Signature · 1 line
2.47.3
Quoted 8 lines · Christoph Hellwig
Hi all,
currently one of the biggest difference between the kernel and xfsprogs for the shared libxfs files is that the all kernel source files first include
xfs.h, while in xfsprogs they first includelibxfs_priv.h. The reason for that is that there is a publicxfs.hheader in xfsprogs that causes a namespace collision.
Quoted 4 lines
This patch renames
xfs.hin the kernel tree toxfs_plaform.h, a name that is still available in xfsprogs. Any other name fitting that criteria should work just as well, I'm open to better suggestion if there are any.
I'm cool with this, so
--D
Quoted 198 lines
Diffstat:
b/fs/xfs/libxfs/xfs_ag.c | 2 - b/fs/xfs/libxfs/xfs_ag_resv.c | 2 - b/fs/xfs/libxfs/xfs_alloc.c | 2 - b/fs/xfs/libxfs/xfs_alloc_btree.c | 2 - b/fs/xfs/libxfs/xfs_attr.c | 2 - b/fs/xfs/libxfs/xfs_attr_leaf.c | 2 - b/fs/xfs/libxfs/xfs_attr_remote.c | 2 - b/fs/xfs/libxfs/xfs_bit.c | 2 - b/fs/xfs/libxfs/xfs_bmap.c | 2 - b/fs/xfs/libxfs/xfs_bmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_btree.c | 2 - b/fs/xfs/libxfs/xfs_btree_mem.c | 2 - b/fs/xfs/libxfs/xfs_btree_staging.c | 2 - b/fs/xfs/libxfs/xfs_da_btree.c | 2 - b/fs/xfs/libxfs/xfs_defer.c | 2 - b/fs/xfs/libxfs/xfs_dir2.c | 2 - b/fs/xfs/libxfs/xfs_dir2_block.c | 2 - b/fs/xfs/libxfs/xfs_dir2_data.c | 2 - b/fs/xfs/libxfs/xfs_dir2_leaf.c | 2 - b/fs/xfs/libxfs/xfs_dir2_node.c | 2 - b/fs/xfs/libxfs/xfs_dir2_sf.c | 2 - b/fs/xfs/libxfs/xfs_dquot_buf.c | 2 - b/fs/xfs/libxfs/xfs_exchmaps.c | 2 - b/fs/xfs/libxfs/xfs_group.c | 2 - b/fs/xfs/libxfs/xfs_ialloc.c | 2 - b/fs/xfs/libxfs/xfs_ialloc_btree.c | 2 - b/fs/xfs/libxfs/xfs_iext_tree.c | 2 - b/fs/xfs/libxfs/xfs_inode_buf.c | 2 - b/fs/xfs/libxfs/xfs_inode_fork.c | 2 - b/fs/xfs/libxfs/xfs_inode_util.c | 2 - b/fs/xfs/libxfs/xfs_log_rlimit.c | 2 - b/fs/xfs/libxfs/xfs_metadir.c | 2 - b/fs/xfs/libxfs/xfs_metafile.c | 2 - b/fs/xfs/libxfs/xfs_parent.c | 2 - b/fs/xfs/libxfs/xfs_refcount.c | 2 - b/fs/xfs/libxfs/xfs_refcount_btree.c | 2 - b/fs/xfs/libxfs/xfs_rmap.c | 2 - b/fs/xfs/libxfs/xfs_rmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_rtbitmap.c | 2 - b/fs/xfs/libxfs/xfs_rtgroup.c | 2 - b/fs/xfs/libxfs/xfs_rtrefcount_btree.c | 2 - b/fs/xfs/libxfs/xfs_rtrmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_sb.c | 2 - b/fs/xfs/libxfs/xfs_symlink_remote.c | 2 - b/fs/xfs/libxfs/xfs_trans_inode.c | 2 - b/fs/xfs/libxfs/xfs_trans_resv.c | 2 - b/fs/xfs/libxfs/xfs_trans_space.c | 2 - b/fs/xfs/libxfs/xfs_types.c | 2 - b/fs/xfs/libxfs/xfs_zones.c | 2 - b/fs/xfs/scrub/agb_bitmap.c | 2 - b/fs/xfs/scrub/agheader.c | 2 - b/fs/xfs/scrub/agheader_repair.c | 2 - b/fs/xfs/scrub/alloc.c | 2 - b/fs/xfs/scrub/alloc_repair.c | 2 - b/fs/xfs/scrub/attr.c | 2 - b/fs/xfs/scrub/attr_repair.c | 2 - b/fs/xfs/scrub/bitmap.c | 2 - b/fs/xfs/scrub/bmap.c | 2 - b/fs/xfs/scrub/bmap_repair.c | 2 - b/fs/xfs/scrub/btree.c | 2 - b/fs/xfs/scrub/common.c | 2 - b/fs/xfs/scrub/cow_repair.c | 2 - b/fs/xfs/scrub/dabtree.c | 2 - b/fs/xfs/scrub/dir.c | 2 - b/fs/xfs/scrub/dir_repair.c | 2 - b/fs/xfs/scrub/dirtree.c | 2 - b/fs/xfs/scrub/dirtree_repair.c | 2 - b/fs/xfs/scrub/dqiterate.c | 2 - b/fs/xfs/scrub/findparent.c | 2 - b/fs/xfs/scrub/fscounters.c | 2 - b/fs/xfs/scrub/fscounters_repair.c | 2 - b/fs/xfs/scrub/health.c | 2 - b/fs/xfs/scrub/ialloc.c | 2 - b/fs/xfs/scrub/ialloc_repair.c | 2 - b/fs/xfs/scrub/inode.c | 2 - b/fs/xfs/scrub/inode_repair.c | 2 - b/fs/xfs/scrub/iscan.c | 2 - b/fs/xfs/scrub/listxattr.c | 2 - b/fs/xfs/scrub/metapath.c | 2 - b/fs/xfs/scrub/newbt.c | 2 - b/fs/xfs/scrub/nlinks.c | 2 - b/fs/xfs/scrub/nlinks_repair.c | 2 - b/fs/xfs/scrub/orphanage.c | 2 - b/fs/xfs/scrub/parent.c | 2 - b/fs/xfs/scrub/parent_repair.c | 2 - b/fs/xfs/scrub/quota.c | 2 - b/fs/xfs/scrub/quota_repair.c | 2 - b/fs/xfs/scrub/quotacheck.c | 2 - b/fs/xfs/scrub/quotacheck_repair.c | 2 - b/fs/xfs/scrub/rcbag.c | 2 - b/fs/xfs/scrub/rcbag_btree.c | 2 - b/fs/xfs/scrub/readdir.c | 2 - b/fs/xfs/scrub/reap.c | 2 - b/fs/xfs/scrub/refcount.c | 2 - b/fs/xfs/scrub/refcount_repair.c | 2 - b/fs/xfs/scrub/repair.c | 2 - b/fs/xfs/scrub/rgsuper.c | 2 - b/fs/xfs/scrub/rmap.c | 2 - b/fs/xfs/scrub/rmap_repair.c | 2 - b/fs/xfs/scrub/rtbitmap.c | 2 - b/fs/xfs/scrub/rtbitmap_repair.c | 2 - b/fs/xfs/scrub/rtrefcount.c | 2 - b/fs/xfs/scrub/rtrefcount_repair.c | 2 - b/fs/xfs/scrub/rtrmap.c | 2 - b/fs/xfs/scrub/rtrmap_repair.c | 2 - b/fs/xfs/scrub/rtsummary.c | 2 - b/fs/xfs/scrub/rtsummary_repair.c | 2 - b/fs/xfs/scrub/scrub.c | 2 - b/fs/xfs/scrub/stats.c | 2 - b/fs/xfs/scrub/symlink.c | 2 - b/fs/xfs/scrub/symlink_repair.c | 2 - b/fs/xfs/scrub/tempfile.c | 2 - b/fs/xfs/scrub/trace.c | 2 - b/fs/xfs/scrub/xfarray.c | 2 - b/fs/xfs/scrub/xfblob.c | 2 - b/fs/xfs/scrub/xfile.c | 2 - b/fs/xfs/xfs_acl.c | 2 - b/fs/xfs/xfs_aops.c | 2 - b/fs/xfs/xfs_attr_inactive.c | 2 - b/fs/xfs/xfs_attr_item.c | 2 - b/fs/xfs/xfs_attr_list.c | 2 - b/fs/xfs/xfs_bio_io.c | 2 - b/fs/xfs/xfs_bmap_item.c | 2 - b/fs/xfs/xfs_bmap_util.c | 2 - b/fs/xfs/xfs_buf.c | 2 - b/fs/xfs/xfs_buf_item.c | 2 - b/fs/xfs/xfs_buf_item_recover.c | 2 - b/fs/xfs/xfs_buf_mem.c | 2 - b/fs/xfs/xfs_dahash_test.c | 2 - b/fs/xfs/xfs_dir2_readdir.c | 2 - b/fs/xfs/xfs_discard.c | 2 - b/fs/xfs/xfs_dquot.c | 2 - b/fs/xfs/xfs_dquot_item.c | 2 - b/fs/xfs/xfs_dquot_item_recover.c | 2 - b/fs/xfs/xfs_drain.c | 2 - b/fs/xfs/xfs_error.c | 2 - b/fs/xfs/xfs_exchmaps_item.c | 2 - b/fs/xfs/xfs_exchrange.c | 2 - b/fs/xfs/xfs_export.c | 2 - b/fs/xfs/xfs_extent_busy.c | 2 - b/fs/xfs/xfs_extfree_item.c | 2 - b/fs/xfs/xfs_file.c | 2 - b/fs/xfs/xfs_filestream.c | 2 - b/fs/xfs/xfs_fsmap.c | 2 - b/fs/xfs/xfs_fsops.c | 2 - b/fs/xfs/xfs_globals.c | 2 - b/fs/xfs/xfs_handle.c | 2 - b/fs/xfs/xfs_health.c | 2 - b/fs/xfs/xfs_hooks.c | 2 - b/fs/xfs/xfs_icache.c | 2 - b/fs/xfs/xfs_icreate_item.c | 2 - b/fs/xfs/xfs_inode.c | 2 - b/fs/xfs/xfs_inode_item.c | 2 - b/fs/xfs/xfs_inode_item_recover.c | 2 - b/fs/xfs/xfs_ioctl.c | 2 - b/fs/xfs/xfs_ioctl32.c | 2 - b/fs/xfs/xfs_iomap.c | 2 - b/fs/xfs/xfs_iops.c | 2 - b/fs/xfs/xfs_itable.c | 2 - b/fs/xfs/xfs_iunlink_item.c | 2 - b/fs/xfs/xfs_iwalk.c | 2 - b/fs/xfs/xfs_log.c | 2 - b/fs/xfs/xfs_log_cil.c | 2 - b/fs/xfs/xfs_log_recover.c | 2 - b/fs/xfs/xfs_message.c | 2 - b/fs/xfs/xfs_mount.c | 2 - b/fs/xfs/xfs_mru_cache.c | 2 - b/fs/xfs/xfs_notify_failure.c | 2 - b/fs/xfs/xfs_platform.h | 46 ++++++++++++++++++++------------- b/fs/xfs/xfs_pnfs.c | 2 - b/fs/xfs/xfs_pwork.c | 2 - b/fs/xfs/xfs_qm.c | 2 - b/fs/xfs/xfs_qm_bhv.c | 2 - b/fs/xfs/xfs_qm_syscalls.c | 2 - b/fs/xfs/xfs_quotaops.c | 2 - b/fs/xfs/xfs_refcount_item.c | 2 - b/fs/xfs/xfs_reflink.c | 2 - b/fs/xfs/xfs_rmap_item.c | 2 - b/fs/xfs/xfs_rtalloc.c | 2 - b/fs/xfs/xfs_stats.c | 2 - b/fs/xfs/xfs_super.c | 2 - b/fs/xfs/xfs_symlink.c | 2 - b/fs/xfs/xfs_sysctl.c | 2 - b/fs/xfs/xfs_sysfs.c | 2 - b/fs/xfs/xfs_trace.c | 2 - b/fs/xfs/xfs_trans.c | 2 - b/fs/xfs/xfs_trans_ail.c | 2 - b/fs/xfs/xfs_trans_buf.c | 2 - b/fs/xfs/xfs_trans_dquot.c | 2 - b/fs/xfs/xfs_xattr.c | 2 - b/fs/xfs/xfs_zone_alloc.c | 2 - b/fs/xfs/xfs_zone_gc.c | 2 - b/fs/xfs/xfs_zone_info.c | 2 - b/fs/xfs/xfs_zone_space_resv.c | 2 - fs/xfs/xfs.h | 28 -------------------- 195 files changed, 222 insertions(+), 238 deletions(-)
Quoted 8 lines · Christoph Hellwig
Hi all,
currently one of the biggest difference between the kernel and xfsprogs for the shared libxfs files is that the all kernel source files first include
xfs.h, while in xfsprogs they first includelibxfs_priv.h. The reason for that is that there is a publicxfs.hheader in xfsprogs that causes a namespace collision.
Quoted 4 lines
This patch renames
xfs.hin the kernel tree toxfs_plaform.h, a name that is still available in xfsprogs. Any other name fitting that criteria should work just as well, I'm open to better suggestion if there are any.
Whole series looks good. Will test.
Quoted 199 lines
Diffstat:
b/fs/xfs/libxfs/xfs_ag.c | 2 - b/fs/xfs/libxfs/xfs_ag_resv.c | 2 - b/fs/xfs/libxfs/xfs_alloc.c | 2 - b/fs/xfs/libxfs/xfs_alloc_btree.c | 2 - b/fs/xfs/libxfs/xfs_attr.c | 2 - b/fs/xfs/libxfs/xfs_attr_leaf.c | 2 - b/fs/xfs/libxfs/xfs_attr_remote.c | 2 - b/fs/xfs/libxfs/xfs_bit.c | 2 - b/fs/xfs/libxfs/xfs_bmap.c | 2 - b/fs/xfs/libxfs/xfs_bmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_btree.c | 2 - b/fs/xfs/libxfs/xfs_btree_mem.c | 2 - b/fs/xfs/libxfs/xfs_btree_staging.c | 2 - b/fs/xfs/libxfs/xfs_da_btree.c | 2 - b/fs/xfs/libxfs/xfs_defer.c | 2 - b/fs/xfs/libxfs/xfs_dir2.c | 2 - b/fs/xfs/libxfs/xfs_dir2_block.c | 2 - b/fs/xfs/libxfs/xfs_dir2_data.c | 2 - b/fs/xfs/libxfs/xfs_dir2_leaf.c | 2 - b/fs/xfs/libxfs/xfs_dir2_node.c | 2 - b/fs/xfs/libxfs/xfs_dir2_sf.c | 2 - b/fs/xfs/libxfs/xfs_dquot_buf.c | 2 - b/fs/xfs/libxfs/xfs_exchmaps.c | 2 - b/fs/xfs/libxfs/xfs_group.c | 2 - b/fs/xfs/libxfs/xfs_ialloc.c | 2 - b/fs/xfs/libxfs/xfs_ialloc_btree.c | 2 - b/fs/xfs/libxfs/xfs_iext_tree.c | 2 - b/fs/xfs/libxfs/xfs_inode_buf.c | 2 - b/fs/xfs/libxfs/xfs_inode_fork.c | 2 - b/fs/xfs/libxfs/xfs_inode_util.c | 2 - b/fs/xfs/libxfs/xfs_log_rlimit.c | 2 - b/fs/xfs/libxfs/xfs_metadir.c | 2 - b/fs/xfs/libxfs/xfs_metafile.c | 2 - b/fs/xfs/libxfs/xfs_parent.c | 2 - b/fs/xfs/libxfs/xfs_refcount.c | 2 - b/fs/xfs/libxfs/xfs_refcount_btree.c | 2 - b/fs/xfs/libxfs/xfs_rmap.c | 2 - b/fs/xfs/libxfs/xfs_rmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_rtbitmap.c | 2 - b/fs/xfs/libxfs/xfs_rtgroup.c | 2 - b/fs/xfs/libxfs/xfs_rtrefcount_btree.c | 2 - b/fs/xfs/libxfs/xfs_rtrmap_btree.c | 2 - b/fs/xfs/libxfs/xfs_sb.c | 2 - b/fs/xfs/libxfs/xfs_symlink_remote.c | 2 - b/fs/xfs/libxfs/xfs_trans_inode.c | 2 - b/fs/xfs/libxfs/xfs_trans_resv.c | 2 - b/fs/xfs/libxfs/xfs_trans_space.c | 2 - b/fs/xfs/libxfs/xfs_types.c | 2 - b/fs/xfs/libxfs/xfs_zones.c | 2 - b/fs/xfs/scrub/agb_bitmap.c | 2 - b/fs/xfs/scrub/agheader.c | 2 - b/fs/xfs/scrub/agheader_repair.c | 2 - b/fs/xfs/scrub/alloc.c | 2 - b/fs/xfs/scrub/alloc_repair.c | 2 - b/fs/xfs/scrub/attr.c | 2 - b/fs/xfs/scrub/attr_repair.c | 2 - b/fs/xfs/scrub/bitmap.c | 2 - b/fs/xfs/scrub/bmap.c | 2 - b/fs/xfs/scrub/bmap_repair.c | 2 - b/fs/xfs/scrub/btree.c | 2 - b/fs/xfs/scrub/common.c | 2 - b/fs/xfs/scrub/cow_repair.c | 2 - b/fs/xfs/scrub/dabtree.c | 2 - b/fs/xfs/scrub/dir.c | 2 - b/fs/xfs/scrub/dir_repair.c | 2 - b/fs/xfs/scrub/dirtree.c | 2 - b/fs/xfs/scrub/dirtree_repair.c | 2 - b/fs/xfs/scrub/dqiterate.c | 2 - b/fs/xfs/scrub/findparent.c | 2 - b/fs/xfs/scrub/fscounters.c | 2 - b/fs/xfs/scrub/fscounters_repair.c | 2 - b/fs/xfs/scrub/health.c | 2 - b/fs/xfs/scrub/ialloc.c | 2 - b/fs/xfs/scrub/ialloc_repair.c | 2 - b/fs/xfs/scrub/inode.c | 2 - b/fs/xfs/scrub/inode_repair.c | 2 - b/fs/xfs/scrub/iscan.c | 2 - b/fs/xfs/scrub/listxattr.c | 2 - b/fs/xfs/scrub/metapath.c | 2 - b/fs/xfs/scrub/newbt.c | 2 - b/fs/xfs/scrub/nlinks.c | 2 - b/fs/xfs/scrub/nlinks_repair.c | 2 - b/fs/xfs/scrub/orphanage.c | 2 - b/fs/xfs/scrub/parent.c | 2 - b/fs/xfs/scrub/parent_repair.c | 2 - b/fs/xfs/scrub/quota.c | 2 - b/fs/xfs/scrub/quota_repair.c | 2 - b/fs/xfs/scrub/quotacheck.c | 2 - b/fs/xfs/scrub/quotacheck_repair.c | 2 - b/fs/xfs/scrub/rcbag.c | 2 - b/fs/xfs/scrub/rcbag_btree.c | 2 - b/fs/xfs/scrub/readdir.c | 2 - b/fs/xfs/scrub/reap.c | 2 - b/fs/xfs/scrub/refcount.c | 2 - b/fs/xfs/scrub/refcount_repair.c | 2 - b/fs/xfs/scrub/repair.c | 2 - b/fs/xfs/scrub/rgsuper.c | 2 - b/fs/xfs/scrub/rmap.c | 2 - b/fs/xfs/scrub/rmap_repair.c | 2 - b/fs/xfs/scrub/rtbitmap.c | 2 - b/fs/xfs/scrub/rtbitmap_repair.c | 2 - b/fs/xfs/scrub/rtrefcount.c | 2 - b/fs/xfs/scrub/rtrefcount_repair.c | 2 - b/fs/xfs/scrub/rtrmap.c | 2 - b/fs/xfs/scrub/rtrmap_repair.c | 2 - b/fs/xfs/scrub/rtsummary.c | 2 - b/fs/xfs/scrub/rtsummary_repair.c | 2 - b/fs/xfs/scrub/scrub.c | 2 - b/fs/xfs/scrub/stats.c | 2 - b/fs/xfs/scrub/symlink.c | 2 - b/fs/xfs/scrub/symlink_repair.c | 2 - b/fs/xfs/scrub/tempfile.c | 2 - b/fs/xfs/scrub/trace.c | 2 - b/fs/xfs/scrub/xfarray.c | 2 - b/fs/xfs/scrub/xfblob.c | 2 - b/fs/xfs/scrub/xfile.c | 2 - b/fs/xfs/xfs_acl.c | 2 - b/fs/xfs/xfs_aops.c | 2 - b/fs/xfs/xfs_attr_inactive.c | 2 - b/fs/xfs/xfs_attr_item.c | 2 - b/fs/xfs/xfs_attr_list.c | 2 - b/fs/xfs/xfs_bio_io.c | 2 - b/fs/xfs/xfs_bmap_item.c | 2 - b/fs/xfs/xfs_bmap_util.c | 2 - b/fs/xfs/xfs_buf.c | 2 - b/fs/xfs/xfs_buf_item.c | 2 - b/fs/xfs/xfs_buf_item_recover.c | 2 - b/fs/xfs/xfs_buf_mem.c | 2 - b/fs/xfs/xfs_dahash_test.c | 2 - b/fs/xfs/xfs_dir2_readdir.c | 2 - b/fs/xfs/xfs_discard.c | 2 - b/fs/xfs/xfs_dquot.c | 2 - b/fs/xfs/xfs_dquot_item.c | 2 - b/fs/xfs/xfs_dquot_item_recover.c | 2 - b/fs/xfs/xfs_drain.c | 2 - b/fs/xfs/xfs_error.c | 2 - b/fs/xfs/xfs_exchmaps_item.c | 2 - b/fs/xfs/xfs_exchrange.c | 2 - b/fs/xfs/xfs_export.c | 2 - b/fs/xfs/xfs_extent_busy.c | 2 - b/fs/xfs/xfs_extfree_item.c | 2 - b/fs/xfs/xfs_file.c | 2 - b/fs/xfs/xfs_filestream.c | 2 - b/fs/xfs/xfs_fsmap.c | 2 - b/fs/xfs/xfs_fsops.c | 2 - b/fs/xfs/xfs_globals.c | 2 - b/fs/xfs/xfs_handle.c | 2 - b/fs/xfs/xfs_health.c | 2 - b/fs/xfs/xfs_hooks.c | 2 - b/fs/xfs/xfs_icache.c | 2 - b/fs/xfs/xfs_icreate_item.c | 2 - b/fs/xfs/xfs_inode.c | 2 - b/fs/xfs/xfs_inode_item.c | 2 - b/fs/xfs/xfs_inode_item_recover.c | 2 - b/fs/xfs/xfs_ioctl.c | 2 - b/fs/xfs/xfs_ioctl32.c | 2 - b/fs/xfs/xfs_iomap.c | 2 - b/fs/xfs/xfs_iops.c | 2 - b/fs/xfs/xfs_itable.c | 2 - b/fs/xfs/xfs_iunlink_item.c | 2 - b/fs/xfs/xfs_iwalk.c | 2 - b/fs/xfs/xfs_log.c | 2 - b/fs/xfs/xfs_log_cil.c | 2 - b/fs/xfs/xfs_log_recover.c | 2 - b/fs/xfs/xfs_message.c | 2 - b/fs/xfs/xfs_mount.c | 2 - b/fs/xfs/xfs_mru_cache.c | 2 - b/fs/xfs/xfs_notify_failure.c | 2 - b/fs/xfs/xfs_platform.h | 46 ++++++++++++++++++++------------- b/fs/xfs/xfs_pnfs.c | 2 - b/fs/xfs/xfs_pwork.c | 2 - b/fs/xfs/xfs_qm.c | 2 - b/fs/xfs/xfs_qm_bhv.c | 2 - b/fs/xfs/xfs_qm_syscalls.c | 2 - b/fs/xfs/xfs_quotaops.c | 2 - b/fs/xfs/xfs_refcount_item.c | 2 - b/fs/xfs/xfs_reflink.c | 2 - b/fs/xfs/xfs_rmap_item.c | 2 - b/fs/xfs/xfs_rtalloc.c | 2 - b/fs/xfs/xfs_stats.c | 2 - b/fs/xfs/xfs_super.c | 2 - b/fs/xfs/xfs_symlink.c | 2 - b/fs/xfs/xfs_sysctl.c | 2 - b/fs/xfs/xfs_sysfs.c | 2 - b/fs/xfs/xfs_trace.c | 2 - b/fs/xfs/xfs_trans.c | 2 - b/fs/xfs/xfs_trans_ail.c | 2 - b/fs/xfs/xfs_trans_buf.c | 2 - b/fs/xfs/xfs_trans_dquot.c | 2 - b/fs/xfs/xfs_xattr.c | 2 - b/fs/xfs/xfs_zone_alloc.c | 2 - b/fs/xfs/xfs_zone_gc.c | 2 - b/fs/xfs/xfs_zone_info.c | 2 - b/fs/xfs/xfs_zone_space_resv.c | 2 - fs/xfs/xfs.h | 28 -------------------- 195 files changed, 222 insertions(+), 238 deletions(-)
Quoted 6 lines · Christoph Hellwig
currently one of the biggest difference between the kernel and xfsprogs for the shared libxfs files is that the all kernel source files first include
xfs.h, while in xfsprogs they first includelibxfs_priv.h. The reason for that is that there is a publicxfs.hheader in xfsprogs that causes a namespace collision.
Quoted 6 lines
This patch renames
xfs.hin the kernel tree toxfs_plaform.h, a name that is still available in xfsprogs. Any other name fitting that criteria should work just as well, I'm open to better suggestion if there are any.[...]
Applied to for-next, thanks!
[1/4] xfs: rename xfs_linux.h to xfs_platform.h
commit: 24bb56d025e315230af06389e46a8b15dfb71c00
[2/4] xfs: include global headers first in xfs_platform.h
commit: c21d7553f83571411bfdd9d49d0682cdf79d396d
[3/4] xfs: move the remaining content from xfs.h to xfs_platform.h
commit: e382d25fea024874f5e6687f85016e6bfc4dd75e
[4/4] xfs: directly include xfs_platform.h
commit: d6e7819ce63f9fc5de59e2f508e1692a4a2969eeBest regards,
Signature · 1 line
Carlos Maiolino <[email protected]>