From: Pavel Reichl <preichl@redhat.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 7/8] xfsprogs: Remove platform_ prefixes in libfrog/common.h
Date: Mon, 2 Aug 2021 23:50:23 +0200 [thread overview]
Message-ID: <20210802215024.949616-8-preichl@redhat.com> (raw)
In-Reply-To: <20210802215024.949616-1-preichl@redhat.com>
---
copy/xfs_copy.c | 8 ++++----
fsr/xfs_fsr.c | 6 +++---
include/defs.h.in | 2 +-
include/linux.h | 16 ++++++++--------
libfrog/common.h | 24 ++++++++++++------------
libfrog/linux.c | 28 ++++++++++++++--------------
libfrog/topology.c | 6 +++---
libxfs/init.c | 32 ++++++++++++++++----------------
libxfs/libxfs_io.h | 2 +-
libxfs/rdwr.c | 4 ++--
mdrestore/xfs_mdrestore.c | 4 ++--
mkfs/xfs_mkfs.c | 10 +++++-----
repair/phase4.c | 6 +++---
repair/prefetch.c | 2 +-
repair/slab.c | 2 +-
repair/xfs_repair.c | 6 +++---
scrub/disk.c | 2 +-
17 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index f06a1557..d5561ac8 100644
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -17,7 +17,7 @@
#define rounddown(x, y) (((x)/(y))*(y))
#define uuid_equal(s,d) (uuid_compare((*s),(*d)) == 0)
-extern int platform_check_ismounted(char *, char *, struct stat *, int);
+extern int check_ismounted(char *, char *, struct stat *, int);
static char *logfile_name;
static FILE *logerr;
@@ -140,7 +140,7 @@ check_errors(void)
for (i = 0; i < num_targets; i++) {
if (target[i].state != INACTIVE) {
- if (platform_flush_device(target[i].fd, 0)) {
+ if (flush_device(target[i].fd, 0)) {
target[i].error = errno;
target[i].state = INACTIVE;
target[i].err_type = 2;
@@ -698,7 +698,7 @@ main(int argc, char **argv)
* check to make sure a filesystem isn't mounted
* on the device
*/
- if (platform_check_ismounted(source_name, NULL, &statbuf, 0)) {
+ if (check_ismounted(source_name, NULL, &statbuf, 0)) {
do_log(
_("%s: Warning -- a filesystem is mounted on the source device.\n"),
progname);
@@ -842,7 +842,7 @@ main(int argc, char **argv)
* check to make sure a filesystem isn't mounted
* on the device
*/
- if (platform_check_ismounted(target[i].name,
+ if (check_ismounted(target[i].name,
NULL, &statbuf, 0)) {
do_log(_("%s: a filesystem is mounted "
"on target device \"%s\".\n"
diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 25eb2e12..42f477e8 100644
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -314,12 +314,12 @@ initallfs(char *mtab)
mi = 0;
fs = fsbase;
- if (platform_mntent_open(&cursor, mtab) != 0){
+ if (mntent_open(&cursor, mtab) != 0){
fprintf(stderr, "Error: can't get mntent entries.\n");
exit(1);
}
- while ((mnt = platform_mntent_next(&cursor)) != NULL) {
+ while ((mnt = mntent_next(&cursor)) != NULL) {
int rw = 0;
if (strcmp(mnt->mnt_type, MNTTYPE_XFS ) != 0 ||
@@ -369,7 +369,7 @@ initallfs(char *mtab)
mi++;
fs++;
}
- platform_mntent_close(&cursor);
+ mntent_close(&cursor);
numfs = mi;
fsend = (fsbase + numfs);
diff --git a/include/defs.h.in b/include/defs.h.in
index ce0c1a0e..fcf27331 100644
--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -78,7 +78,7 @@ typedef unsigned short umode_t;
# define ASSERT(EX) ((void) 0)
#endif
-extern int platform_nproc(void);
+extern int libfrog_nproc(void);
#define NSEC_PER_SEC (1000000000ULL)
#define NSEC_PER_USEC (1000ULL)
diff --git a/include/linux.h b/include/linux.h
index a12ccee1..da74ae53 100644
--- a/include/linux.h
+++ b/include/linux.h
@@ -41,7 +41,7 @@ static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
}
/*
- * platform_test_xfs_*() implies that xfsctl will succeed on the file;
+ * test_xfs_*() implies that xfsctl will succeed on the file;
* on Linux, at least, special files don't get xfs file ops,
* so return 0 for those
*/
@@ -85,7 +85,7 @@ static __inline__ void getoptreset(void)
#endif
static __inline__ int
-platform_discard_blocks(int fd, uint64_t start, uint64_t len)
+discard_blocks(int fd, uint64_t start, uint64_t len)
{
uint64_t range[2] = { start, len };
@@ -111,7 +111,7 @@ struct mntent_cursor {
FILE *mtabp;
};
-static inline int platform_mntent_open(struct mntent_cursor * cursor, char *mtab)
+static inline int mntent_open(struct mntent_cursor * cursor, char *mtab)
{
cursor->mtabp = setmntent(mtab, "r");
if (!cursor->mtabp) {
@@ -121,19 +121,19 @@ static inline int platform_mntent_open(struct mntent_cursor * cursor, char *mtab
return 0;
}
-static inline struct mntent * platform_mntent_next(struct mntent_cursor * cursor)
+static inline struct mntent * mntent_next(struct mntent_cursor * cursor)
{
return getmntent(cursor->mtabp);
}
-static inline void platform_mntent_close(struct mntent_cursor * cursor)
+static inline void mntent_close(struct mntent_cursor * cursor)
{
endmntent(cursor->mtabp);
}
#if defined(FALLOC_FL_ZERO_RANGE)
static inline int
-platform_zero_range(
+zero_range(
int fd,
xfs_off_t start,
size_t len)
@@ -146,7 +146,7 @@ platform_zero_range(
return -errno;
}
#else
-#define platform_zero_range(fd, s, l) (-EOPNOTSUPP)
+#define zero_range(fd, s, l) (-EOPNOTSUPP)
#endif
/*
@@ -154,7 +154,7 @@ platform_zero_range(
* atexit handlers.
*/
static inline void
-platform_crash(void)
+crash(void)
{
kill(getpid(), SIGKILL);
assert(0);
diff --git a/libfrog/common.h b/libfrog/common.h
index 0aef318a..4d1d5861 100644
--- a/libfrog/common.h
+++ b/libfrog/common.h
@@ -7,20 +7,20 @@
#ifndef __LIBFROG_PLATFORM_H__
#define __LIBFROG_PLATFORM_H__
-int platform_check_ismounted(char *path, char *block, struct stat *sptr,
+int check_ismounted(char *path, char *block, struct stat *sptr,
int verbose);
-int platform_check_iswritable(char *path, char *block, struct stat *sptr);
-int platform_set_blocksize(int fd, char *path, dev_t device, int bsz,
+int check_iswritable(char *path, char *block, struct stat *sptr);
+int set_blocksize(int fd, char *path, dev_t device, int bsz,
int fatal);
-int platform_flush_device(int fd, dev_t device);
-char *platform_findrawpath(char *path);
-char *platform_findblockpath(char *path);
-int platform_direct_blockdev(void);
-int platform_align_blockdev(void);
-unsigned long platform_physmem(void); /* in kilobytes */
-void platform_findsizes(char *path, int fd, long long *sz, int *bsz);
-int platform_nproc(void);
+int flush_device(int fd, dev_t device);
+char *findrawpath(char *path);
+char *findblockpath(char *path);
+int direct_blockdev(void);
+int align_blockdev(void);
+unsigned long physmem(void); /* in kilobytes */
+void findsizes(char *path, int fd, long long *sz, int *bsz);
+int libfrog_nproc(void);
-void platform_findsizes(char *path, int fd, long long *sz, int *bsz);
+void findsizes(char *path, int fd, long long *sz, int *bsz);
#endif /* __LIBFROG_PLATFORM_H__ */
diff --git a/libfrog/linux.c b/libfrog/linux.c
index ea69b29b..7f4e2a0d 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c
@@ -40,7 +40,7 @@ static int max_block_alignment;
#define CHECK_MOUNT_WRITABLE 0x2
static int
-platform_check_mount(char *name, char *block, struct stat *s, int flags)
+check_mount(char *name, char *block, struct stat *s, int flags)
{
FILE *f;
struct stat st, mst;
@@ -108,26 +108,26 @@ _("%s: %s contains a mounted filesystem\n"),
}
int
-platform_check_ismounted(char *name, char *block, struct stat *s, int verbose)
+check_ismounted(char *name, char *block, struct stat *s, int verbose)
{
int flags;
flags = verbose ? CHECK_MOUNT_VERBOSE : 0;
- return platform_check_mount(name, block, s, flags);
+ return check_mount(name, block, s, flags);
}
int
-platform_check_iswritable(char *name, char *block, struct stat *s)
+check_iswritable(char *name, char *block, struct stat *s)
{
int flags;
/* Writable checks are always verbose */
flags = CHECK_MOUNT_WRITABLE | CHECK_MOUNT_VERBOSE;
- return platform_check_mount(name, block, s, flags);
+ return check_mount(name, block, s, flags);
}
int
-platform_set_blocksize(int fd, char *path, dev_t device, int blocksize, int fatal)
+set_blocksize(int fd, char *path, dev_t device, int blocksize, int fatal)
{
int error = 0;
@@ -147,7 +147,7 @@ platform_set_blocksize(int fd, char *path, dev_t device, int blocksize, int fata
* success or -1 (with errno set) for failure.
*/
int
-platform_flush_device(
+flush_device(
int fd,
dev_t device)
{
@@ -172,7 +172,7 @@ platform_flush_device(
}
void
-platform_findsizes(char *path, int fd, long long *sz, int *bsz)
+findsizes(char *path, int fd, long long *sz, int *bsz)
{
struct stat st;
uint64_t size;
@@ -232,25 +232,25 @@ platform_findsizes(char *path, int fd, long long *sz, int *bsz)
}
char *
-platform_findrawpath(char *path)
+findrawpath(char *path)
{
return path;
}
char *
-platform_findblockpath(char *path)
+findblockpath(char *path)
{
return path;
}
int
-platform_direct_blockdev(void)
+direct_blockdev(void)
{
return 1;
}
int
-platform_align_blockdev(void)
+align_blockdev(void)
{
if (!max_block_alignment)
return getpagesize();
@@ -259,7 +259,7 @@ platform_align_blockdev(void)
/* How many CPUs are online? */
int
-platform_nproc(void)
+libfrog_nproc(void)
{
long nproc = sysconf(_SC_NPROCESSORS_ONLN);
@@ -271,7 +271,7 @@ platform_nproc(void)
}
unsigned long
-platform_physmem(void)
+physmem(void)
{
struct sysinfo si;
diff --git a/libfrog/topology.c b/libfrog/topology.c
index b059829e..d6e3aa32 100644
--- a/libfrog/topology.c
+++ b/libfrog/topology.c
@@ -117,7 +117,7 @@ check_overwrite(
fd = open(device, O_RDONLY);
if (fd < 0)
goto out;
- platform_findsizes((char *)device, fd, &size, &bsz);
+ findsizes((char *)device, fd, &size, &bsz);
close(fd);
/* nothing to overwrite on a 0-length device */
@@ -296,7 +296,7 @@ void get_topology(
char *dfile = xi->volname ? xi->volname : xi->dname;
/*
- * If our target is a regular file, use platform_findsizes
+ * If our target is a regular file, use findsizes
* to try to obtain the underlying filesystem's requirements
* for direct IO; we'll set our sector size to that if possible.
*/
@@ -312,7 +312,7 @@ void get_topology(
fd = open(dfile, flags, 0666);
if (fd >= 0) {
- platform_findsizes(dfile, fd, &dummy, &ft->lsectorsize);
+ findsizes(dfile, fd, &dummy, &ft->lsectorsize);
close(fd);
ft->psectorsize = ft->lsectorsize;
} else
diff --git a/libxfs/init.c b/libxfs/init.c
index d1e87002..120714c9 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -59,9 +59,9 @@ check_isactive(char *name, char *block, int fatal)
return 0;
if ((st.st_mode & S_IFMT) != S_IFBLK)
return 0;
- if (platform_check_ismounted(name, block, &st, 0) == 0)
+ if (check_ismounted(name, block, &st, 0) == 0)
return 0;
- if (platform_check_iswritable(name, block, &st))
+ if (check_iswritable(name, block, &st))
return fatal ? 1 : 0;
return 0;
}
@@ -98,7 +98,7 @@ libxfs_device_open(char *path, int creat, int xflags, int setblksize)
readonly = (xflags & LIBXFS_ISREADONLY);
excl = (xflags & LIBXFS_EXCLUSIVELY) && !creat;
- dio = (xflags & LIBXFS_DIRECT) && !creat && platform_direct_blockdev();
+ dio = (xflags & LIBXFS_DIRECT) && !creat && direct_blockdev();
retry:
flags = (readonly ? O_RDONLY : O_RDWR) | \
@@ -123,10 +123,10 @@ retry:
if (!readonly && setblksize && (statb.st_mode & S_IFMT) == S_IFBLK) {
if (setblksize == 1)
/* use the default blocksize */
- (void)platform_set_blocksize(fd, path, statb.st_rdev, XFS_MIN_SECTORSIZE, 0);
+ (void)set_blocksize(fd, path, statb.st_rdev, XFS_MIN_SECTORSIZE, 0);
else {
/* given an explicit blocksize to use */
- if (platform_set_blocksize(fd, path, statb.st_rdev, setblksize, 1))
+ if (set_blocksize(fd, path, statb.st_rdev, setblksize, 1))
exit(1);
}
}
@@ -171,7 +171,7 @@ libxfs_device_close(dev_t dev)
fd = dev_map[d].fd;
dev_map[d].dev = dev_map[d].fd = 0;
- ret = platform_flush_device(fd, dev);
+ ret = flush_device(fd, dev);
if (ret) {
ret = -errno;
fprintf(stderr,
@@ -200,19 +200,19 @@ check_open(char *path, int flags, char **rawfile, char **blockfile)
perror(path);
return 0;
}
- if (!(*rawfile = platform_findrawpath(path))) {
+ if (!(*rawfile = findrawpath(path))) {
fprintf(stderr, _("%s: "
"can't find a character device matching %s\n"),
progname, path);
return 0;
}
- if (!(*blockfile = platform_findblockpath(path))) {
+ if (!(*blockfile = findblockpath(path))) {
fprintf(stderr, _("%s: "
"can't find a block device matching %s\n"),
progname, path);
return 0;
}
- if (!readonly && !inactive && platform_check_ismounted(path, *blockfile, NULL, 1))
+ if (!readonly && !inactive && check_ismounted(path, *blockfile, NULL, 1))
return 0;
if (inactive && check_isactive(path, *blockfile, ((readonly|dangerously)?1:0)))
@@ -324,7 +324,7 @@ libxfs_init(libxfs_init_t *a)
a->ddev= libxfs_device_open(dname, a->dcreat, flags,
a->setblksize);
a->dfd = libxfs_device_to_fd(a->ddev);
- platform_findsizes(dname, a->dfd, &a->dsize,
+ findsizes(dname, a->dfd, &a->dsize,
&a->dbsize);
} else {
if (!check_open(dname, flags, &rawfile, &blockfile))
@@ -332,7 +332,7 @@ libxfs_init(libxfs_init_t *a)
a->ddev = libxfs_device_open(rawfile,
a->dcreat, flags, a->setblksize);
a->dfd = libxfs_device_to_fd(a->ddev);
- platform_findsizes(rawfile, a->dfd,
+ findsizes(rawfile, a->dfd,
&a->dsize, &a->dbsize);
}
} else
@@ -342,7 +342,7 @@ libxfs_init(libxfs_init_t *a)
a->logdev = libxfs_device_open(logname,
a->lcreat, flags, a->setblksize);
a->logfd = libxfs_device_to_fd(a->logdev);
- platform_findsizes(dname, a->logfd, &a->logBBsize,
+ findsizes(dname, a->logfd, &a->logBBsize,
&a->lbsize);
} else {
if (!check_open(logname, flags, &rawfile, &blockfile))
@@ -350,7 +350,7 @@ libxfs_init(libxfs_init_t *a)
a->logdev = libxfs_device_open(rawfile,
a->lcreat, flags, a->setblksize);
a->logfd = libxfs_device_to_fd(a->logdev);
- platform_findsizes(rawfile, a->logfd,
+ findsizes(rawfile, a->logfd,
&a->logBBsize, &a->lbsize);
}
} else
@@ -360,7 +360,7 @@ libxfs_init(libxfs_init_t *a)
a->rtdev = libxfs_device_open(rtname,
a->rcreat, flags, a->setblksize);
a->rtfd = libxfs_device_to_fd(a->rtdev);
- platform_findsizes(dname, a->rtfd, &a->rtsize,
+ findsizes(dname, a->rtfd, &a->rtsize,
&a->rtbsize);
} else {
if (!check_open(rtname, flags, &rawfile, &blockfile))
@@ -368,7 +368,7 @@ libxfs_init(libxfs_init_t *a)
a->rtdev = libxfs_device_open(rawfile,
a->rcreat, flags, a->setblksize);
a->rtfd = libxfs_device_to_fd(a->rtdev);
- platform_findsizes(rawfile, a->rtfd,
+ findsizes(rawfile, a->rtfd,
&a->rtsize, &a->rtbsize);
}
} else
@@ -1030,7 +1030,7 @@ libxfs_destroy(
int
libxfs_device_alignment(void)
{
- return platform_align_blockdev();
+ return align_blockdev();
}
void
diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 3cc4f4ee..a81bd659 100644
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -46,7 +46,7 @@ xfs_buftarg_trip_write(
pthread_mutex_lock(&btp->lock);
btp->writes_left--;
if (!btp->writes_left)
- platform_crash();
+ crash();
pthread_mutex_unlock(&btp->lock);
}
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index f8e4cf0a..85094fe6 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -73,7 +73,7 @@ libxfs_device_zero(struct xfs_buftarg *btp, xfs_daddr_t start, uint len)
/* try to use special zeroing methods, fall back to writes if needed */
len_bytes = LIBXFS_BBTOOFF64(len);
- error = platform_zero_range(fd, start_offset, len_bytes);
+ error = zero_range(fd, start_offset, len_bytes);
if (!error) {
xfs_buftarg_trip_write(btp);
return 0;
@@ -1143,7 +1143,7 @@ libxfs_blkdev_issue_flush(
return 0;
fd = libxfs_device_to_fd(btp->bt_bdev);
- ret = platform_flush_device(fd, btp->bt_bdev);
+ ret = flush_device(fd, btp->bt_bdev);
return ret ? -errno : 0;
}
diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 1cd399db..4a894f3b 100644
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -182,7 +182,7 @@ usage(void)
exit(1);
}
-extern int platform_check_ismounted(char *, char *, struct stat *, int);
+extern int check_ismounted(char *, char *, struct stat *, int);
int
main(
@@ -275,7 +275,7 @@ main(
/*
* check to make sure a filesystem isn't mounted on the device
*/
- if (platform_check_ismounted(argv[optind], NULL, &statbuf, 0))
+ if (check_ismounted(argv[optind], NULL, &statbuf, 0))
fatal("a filesystem is mounted on target device \"%s\","
" cannot restore to a mounted filesystem.\n",
argv[optind]);
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index c6929a83..ffa79b86 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1263,7 +1263,7 @@ done:
}
static void
-discard_blocks(dev_t dev, uint64_t nsectors, int quiet)
+mkfs_discard_blocks(dev_t dev, uint64_t nsectors, int quiet)
{
int fd;
uint64_t offset = 0;
@@ -1286,7 +1286,7 @@ discard_blocks(dev_t dev, uint64_t nsectors, int quiet)
* not necessary for the mkfs functionality but just an
* optimization. However we should stop on error.
*/
- if (platform_discard_blocks(fd, offset, tmp_step) == 0) {
+ if (discard_blocks(fd, offset, tmp_step) == 0) {
if (offset == 0 && !quiet) {
printf("Discarding blocks...");
fflush(stdout);
@@ -2664,11 +2664,11 @@ discard_devices(
*/
if (!xi->disfile)
- discard_blocks(xi->ddev, xi->dsize, quiet);
+ mkfs_discard_blocks(xi->ddev, xi->dsize, quiet);
if (xi->rtdev && !xi->risfile)
- discard_blocks(xi->rtdev, xi->rtsize, quiet);
+ mkfs_discard_blocks(xi->rtdev, xi->rtsize, quiet);
if (xi->logdev && xi->logdev != xi->ddev && !xi->lisfile)
- discard_blocks(xi->logdev, xi->logBBsize, quiet);
+ mkfs_discard_blocks(xi->logdev, xi->logBBsize, quiet);
}
static void
diff --git a/repair/phase4.c b/repair/phase4.c
index 191b4842..1d509187 100644
--- a/repair/phase4.c
+++ b/repair/phase4.c
@@ -235,7 +235,7 @@ process_rmap_data(
if (!rmap_needs_work(mp))
return;
- create_work_queue(&wq, mp, platform_nproc());
+ create_work_queue(&wq, mp, libfrog_nproc());
for (i = 0; i < mp->m_sb.sb_agcount; i++)
queue_work(&wq, check_rmap_btrees, i, NULL);
destroy_work_queue(&wq);
@@ -243,12 +243,12 @@ process_rmap_data(
if (!xfs_sb_version_hasreflink(&mp->m_sb))
return;
- create_work_queue(&wq, mp, platform_nproc());
+ create_work_queue(&wq, mp, libfrog_nproc());
for (i = 0; i < mp->m_sb.sb_agcount; i++)
queue_work(&wq, compute_ag_refcounts, i, NULL);
destroy_work_queue(&wq);
- create_work_queue(&wq, mp, platform_nproc());
+ create_work_queue(&wq, mp, libfrog_nproc());
for (i = 0; i < mp->m_sb.sb_agcount; i++) {
queue_work(&wq, process_inode_reflink_flags, i, NULL);
queue_work(&wq, check_refcount_btrees, i, NULL);
diff --git a/repair/prefetch.c b/repair/prefetch.c
index 48affa18..57d5e631 100644
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -1024,7 +1024,7 @@ do_inode_prefetch(
*/
if (check_cache && !libxfs_bcache_overflowed()) {
queue.wq_ctx = mp;
- create_work_queue(&queue, mp, platform_nproc());
+ create_work_queue(&queue, mp, libfrog_nproc());
for (i = 0; i < mp->m_sb.sb_agcount; i++)
queue_work(&queue, func, i, NULL);
destroy_work_queue(&queue);
diff --git a/repair/slab.c b/repair/slab.c
index 165f97ef..996f9d80 100644
--- a/repair/slab.c
+++ b/repair/slab.c
@@ -234,7 +234,7 @@ qsort_slab(
return;
}
- create_work_queue(&wq, NULL, platform_nproc());
+ create_work_queue(&wq, NULL, libfrog_nproc());
hdr = slab->s_first;
while (hdr) {
qs = malloc(sizeof(struct qsort_slab));
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index af24b356..a112b424 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -882,7 +882,7 @@ phase_end(int phase)
/* Fail if someone injected an post-phase error. */
if (fail_after_phase && phase == fail_after_phase)
- platform_crash();
+ crash();
}
int
@@ -1030,7 +1030,7 @@ main(int argc, char **argv)
}
if (ag_stride) {
- int max_threads = platform_nproc() * 8;
+ int max_threads = libfrog_nproc() * 8;
thread_count = (glob_agcount + ag_stride - 1) / ag_stride;
while (thread_count > max_threads) {
@@ -1081,7 +1081,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 :
- platform_physmem() * 3 / 4;
+ physmem() * 3 / 4;
if (getrlimit(RLIMIT_AS, &rlim) != -1 &&
rlim.rlim_cur != RLIM_INFINITY) {
diff --git a/scrub/disk.c b/scrub/disk.c
index 8bd2a36d..f6d37b46 100644
--- a/scrub/disk.c
+++ b/scrub/disk.c
@@ -43,7 +43,7 @@ __disk_heads(
{
int iomin;
int ioopt;
- int nproc = platform_nproc();
+ int nproc = libfrog_nproc();
unsigned short rot;
int error;
--
2.31.1
next prev parent reply other threads:[~2021-08-02 21:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 21:50 [PATCH 0/8] xfsprogs: Drop the 'platform_' prefix Pavel Reichl
2021-08-02 21:50 ` [PATCH 1/8] xfsprogs: Rename platform_defs.h.in -> defs.h.in Pavel Reichl
2021-08-02 21:50 ` [PATCH 2/8] xfsprogs: Rename platform.h -> common.h Pavel Reichl
2021-08-02 22:33 ` Darrick J. Wong
2021-08-03 16:15 ` Pavel Reichl
2021-08-02 21:50 ` [PATCH 3/8] xfsprogs: remove platform_uuid_compare() Pavel Reichl
2021-08-02 22:35 ` Darrick J. Wong
2021-08-03 16:07 ` Pavel Reichl
2021-08-02 21:50 ` [PATCH 4/8] xfsprogs: remove platform_{test_xfs_fd,path,fstatfs} Pavel Reichl
2021-08-02 22:31 ` Darrick J. Wong
2021-08-02 21:50 ` [PATCH 5/8] xfsprogs: Rename platform_getoptreset -> getoptreset Pavel Reichl
2021-08-02 21:50 ` [PATCH 6/8] xfsprogs: remove all platform_ prefixes in linux.h Pavel Reichl
2021-08-02 21:50 ` Pavel Reichl [this message]
2021-08-02 21:50 ` [PATCH 8/8] xfsprogs: remove platform_ from man xfsctl man page Pavel Reichl
2021-08-02 22:24 ` [PATCH 0/8] xfsprogs: Drop the 'platform_' prefix Darrick J. Wong
2021-08-23 22:45 ` Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210802215024.949616-8-preichl@redhat.com \
--to=preichl@redhat.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.