Re: [PATCH 2/4] libfrog: remove libxfs.h dependencies in fsgeom.c and linux.c

Allison Collins <allison.henderson@xxxxxxxxxx> · Tue, 4 Feb 2020 22:28:53 -0700

On 2/4/20 5:46 PM, Darrick J. Wong wrote:
From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>

libfrog isn't supposed to depend on libxfs, so don't include the header
file in the libfrog source code.

Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>

Looks ok
Reviewed-by: Allison Collins <allison.henderson@xxxxxxxxxx>

---
  libfrog/fsgeom.c |    4 +++-
  libfrog/linux.c  |    4 ++--
  2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
index 19a4911f..bd93924e 100644
--- a/libfrog/fsgeom.c
+++ b/libfrog/fsgeom.c
@@ -2,7 +2,9 @@
  /*
   * Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved.
   */
-#include "libxfs.h"
+#include "platform_defs.h"
+#include "xfs.h"
+#include "bitops.h"
  #include "fsgeom.h"
  #include "util.h"
  
diff --git a/libfrog/linux.c b/libfrog/linux.c
index 79bd79eb..41a168b4 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c
@@ -9,8 +9,8 @@
  #include <sys/ioctl.h>
  #include <sys/sysinfo.h>
  
-#include "libxfs_priv.h"
-#include "xfs_fs.h"
+#include "platform_defs.h"
+#include "xfs.h"
  #include "init.h"
  
  extern char *progname;







