libxfs: remove libxfs_nproc

Remove libxfs_nproc since it's a wrapper around a libfrog function.

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 227084ae142e04e605b13d3970fcb17a0d250159..405572eee71dcbba7e1d5cb8b0d95a8486a1ad82 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -161,7 +161,6 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
 #endif
 
 
-extern int             libxfs_nproc(void);
 extern unsigned long   libxfs_physmem(void);   /* in kilobytes */
 
 #include "xfs_ialloc.h"

diff --git a/libxfs/init.c b/libxfs/init.c
index 4446a62a1765669621047279c5934b8310dc1080..9e7624353ba201cc03e4c5ad1007181bda7871d1 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -853,17 +853,6 @@ libxfs_report(FILE *fp)
        fprintf(fp, "%s", c);
 }
 
-int
-libxfs_nproc(void)
-{
-       int     nr;
-
-       nr = platform_nproc();
-       if (nr < 1)
-               nr = 1;
-       return nr;
-}
-
 unsigned long
 libxfs_physmem(void)
 {

diff --git a/repair/phase4.c b/repair/phase4.c
index 66e69db72e27234ab29b710b13109d468d93f37d..e1ba778fdf56c10d985228285693eb318c389451 100644 (file)
--- 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, libxfs_nproc());
+       create_work_queue(&wq, mp, platform_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, libxfs_nproc());
+       create_work_queue(&wq, mp, platform_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, libxfs_nproc());
+       create_work_queue(&wq, mp, platform_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 beb36cd68843674c0ef61d2abb13f2dbc02f3c1f..8e3772ed16f32b04aaba7aff4b12e2d06b906465 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -1015,7 +1015,7 @@ do_inode_prefetch(
         */
        if (check_cache && !libxfs_bcache_overflowed()) {
                queue.wq_ctx = mp;
-               create_work_queue(&queue, mp, libxfs_nproc());
+               create_work_queue(&queue, mp, platform_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 ba5c232776564a4ada7b90b8b8aab3fe736e412e..f075ee5be31a3d4468de2822cecb06f8422a9604 100644 (file)
--- a/repair/slab.c
+++ b/repair/slab.c
@@ -234,7 +234,7 @@ qsort_slab(
                return;
        }
 
-       create_work_queue(&wq, NULL, libxfs_nproc());
+       create_work_queue(&wq, NULL, platform_nproc());
        hdr = slab->s_first;
        while (hdr) {
                qs = malloc(sizeof(struct qsort_slab));