Commit cf9b52fa authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Carlos Maiolino
Browse files

xfs: directly include xfs_platform.h 



The 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.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parent 19a46f12

fs/xfs/libxfs/xfs_ag.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (C) 2016 Oracle.  All Rights Reserved.

 * Author: Darrick J. Wong <darrick.wong@oracle.com>

 */

#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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"