From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Fri, 1 Nov 2019 20:38:35 +0000 (-0400)
Subject: libxfs: remove libxfs_physmem
X-Git-Tag: v5.3.0-rc2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e5fe12368f9d8670d9516ab8e02827980775e5c;p=thirdparty%2Fxfsprogs-dev.git

libxfs: remove libxfs_physmem

Remove this thin wrapper too.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/include/libxfs.h b/include/libxfs.h
index 405572eee..0cc0820b5 100644
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -160,9 +160,6 @@ extern void cmn_err(int, char *, ...);
 enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
 #endif
 
-
-extern unsigned long	libxfs_physmem(void);	/* in kilobytes */
-
 #include "xfs_ialloc.h"
 
 #include "xfs_attr_leaf.h"
diff --git a/libxfs/init.c b/libxfs/init.c
index 9e7624353..537b73bd9 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -852,9 +852,3 @@ libxfs_report(FILE *fp)
 	c = asctime(localtime(&t));
 	fprintf(fp, "%s", c);
 }
-
-unsigned long
-libxfs_physmem(void)
-{
-	return platform_physmem();
-}
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 7e810ef46..df65b6c58 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -852,7 +852,7 @@ main(int argc, char **argv)
 					(mp->m_sb.sb_dblocks >> (10 + 1)) +
 					50000;	/* rough estimate of 50MB overhead */
 		max_mem = max_mem_specified ? max_mem_specified * 1024 :
-						libxfs_physmem() * 3 / 4;
+					      platform_physmem() * 3 / 4;
 
 		if (getrlimit(RLIMIT_AS, &rlim) != -1 &&
 					rlim.rlim_cur != RLIM_INFINITY) {