From 20160a46964e790ca6437b86193df5f537a4757b Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Mon, 8 Oct 2007 03:05:54 +0000
Subject: [PATCH] Branch b1_6 b=12744 i=johann, adilger
NR_CPUS/smp_num_cpus -> num_possible_cpus().
---
lustre/mds/handler.c | 2 +-
lustre/ost/ost_handler.c | 2 +-
lustre/ptlrpc/service.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 8309aa6f72..969b66a923 100644
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -2547,7 +2547,7 @@ static int mdt_setup(struct obd_device *obd, obd_count len, void *buf)
mds_max_threads = mds_min_threads = mds_num_threads;
} else {
/* Base min threads on memory and cpus */
- mds_min_threads = smp_num_cpus * num_physpages >>
+ mds_min_threads = num_possible_cpus() * num_physpages >>
(27 - CFS_PAGE_SHIFT);
if (mds_min_threads < MDS_THREADS_MIN)
mds_min_threads = MDS_THREADS_MIN;
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 14dce9a823..4b5d7e6a51 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -1750,7 +1750,7 @@ static int ost_setup(struct obd_device *obd, obd_count len, void *buf)
oss_max_threads = oss_min_threads = oss_num_threads;
} else {
/* Base min threads on memory and cpus */
- oss_min_threads = smp_num_cpus * num_physpages >>
+ oss_min_threads = num_possible_cpus() * num_physpages >>
(27 - CFS_PAGE_SHIFT);
if (oss_min_threads < OSS_THREADS_MIN)
oss_min_threads = OSS_THREADS_MIN;
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 6b05e5bc1b..40bddf16ae 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -1271,7 +1271,7 @@ static int ptlrpc_main(void *arg)
if (svc->srv_cpu_affinity) {
int cpu, num_cpu;
- for (cpu = 0, num_cpu = 0; cpu < NR_CPUS; cpu++) {
+ for (cpu = 0, num_cpu = 0; cpu < num_possible_cpus(); cpu++) {
if (!cpu_online(cpu))
continue;
if (num_cpu == thread->t_id % num_online_cpus())
--
GitLab