From 46fb381379a19a856c57b57cb56c67dc8af4def5 Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Thu, 18 Oct 2007 04:49:00 +0000
Subject: [PATCH] Branch b1_6 b=12744 i=adilger, johann
get rid of smp_num_cpus, instead use num_online_cpus() and/or num_possible_cpus().
---
lustre/include/liblustre.h | 7 +++++--
lustre/include/lustre_dlm.h | 2 +-
lustre/include/lustre_net.h | 11 ++++++-----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 6ffe325069..a08300e462 100644
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -95,8 +95,11 @@ typedef unsigned short umode_t;
#ifndef smp_processor_id
#define smp_processor_id() 0
#endif
-#ifndef smp_num_cpus
-#define smp_num_cpus 1
+#ifndef num_online_cpus
+#define num_online_cpus() 1
+#endif
+#ifndef num_possible_cpus
+#define num_possible_cpus() 1
#endif
/* always adopt 2.5 definitions */
diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h
index 020ce337c9..0463a3f9d0 100644
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -27,7 +27,7 @@ struct obd_device;
#define OBD_LDLM_DEVICENAME "ldlm"
-#define LDLM_DEFAULT_LRU_SIZE (100 * smp_num_cpus)
+#define LDLM_DEFAULT_LRU_SIZE (100 * num_online_cpus())
#define LDLM_DEFAULT_MAX_ALIVE (cfs_time_seconds(36000))
typedef enum {
diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index da149835a1..2391e80c57 100644
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -85,10 +85,11 @@
* considered full when less than ?_MAXREQSIZE is left in them.
*/
-#define LDLM_THREADS_AUTO_MIN min((int)(smp_num_cpus * smp_num_cpus * 2), 8)
+#define LDLM_THREADS_AUTO_MIN \
+ min((int)(num_online_cpus() * num_online_cpus() * 2), 8)
#define LDLM_THREADS_AUTO_MAX (LDLM_THREADS_AUTO_MIN * 16)
#define LDLM_BL_THREADS LDLM_THREADS_AUTO_MIN
-#define LDLM_NBUFS (64 * smp_num_cpus)
+#define LDLM_NBUFS (64 * num_online_cpus())
#define LDLM_BUFSIZE (8 * 1024)
#define LDLM_MAXREQSIZE (5 * 1024)
#define LDLM_MAXREPSIZE (1024)
@@ -97,7 +98,7 @@
#define MDS_THREADS_MIN 2
#define MDS_THREADS_MAX 512
#define MDS_THREADS_MIN_READPAGE 2
-#define MDS_NBUFS (64 * smp_num_cpus)
+#define MDS_NBUFS (64 * num_online_cpus())
#define MDS_BUFSIZE (8 * 1024)
/* Assume file name length = FNAME_MAX = 256 (true for ext3).
* path name length = PATH_MAX = 4096
@@ -121,7 +122,7 @@
#define MGS_THREADS_AUTO_MIN 2
#define MGS_THREADS_AUTO_MAX 32
-#define MGS_NBUFS (64 * smp_num_cpus)
+#define MGS_NBUFS (64 * num_online_cpus())
#define MGS_BUFSIZE (8 * 1024)
#define MGS_MAXREQSIZE (8 * 1024)
#define MGS_MAXREPSIZE (9 * 1024)
@@ -129,7 +130,7 @@
/* Absolute limits */
#define OSS_THREADS_MIN 2
#define OSS_THREADS_MAX 512
-#define OST_NBUFS (64 * smp_num_cpus)
+#define OST_NBUFS (64 * num_online_cpus())
#define OST_BUFSIZE (8 * 1024)
/* OST_MAXREQSIZE ~= 4768 bytes =
* lustre_msg + obdo + 16 * obd_ioobj + 256 * niobuf_remote
--
GitLab