From fbe40f6fad62a3a699c4d04dbc9b68ce1485d870 Mon Sep 17 00:00:00 2001
From: shadow <shadow>
Date: Thu, 22 May 2008 05:14:12 +0000
Subject: [PATCH] fix build on rhel5/ia64. b=15851 i=zam
---
lustre/include/lustre_net.h | 6 +++---
lustre/ldlm/ldlm_pool.c | 2 +-
lustre/ldlm/ldlm_request.c | 2 +-
lustre/liblustre/tests/sanity.c | 24 ++++++++++++------------
lustre/lvfs/lvfs_linux.c | 2 +-
lustre/obdclass/capa.c | 8 ++++----
lustre/ost/ost_handler.c | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 30204b7be5..04098d3a25 100644
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -100,11 +100,11 @@
#define MDT_MIN_THREADS 2UL
#define MDT_MAX_THREADS 512UL
#define MDT_NUM_THREADS max(min_t(unsigned long, MDT_MAX_THREADS, \
- num_physpages >> (25 - PAGE_SHIFT)), 2UL)
+ num_physpages >> (25 - CFS_PAGE_SHIFT)), 2UL)
#define FLD_NUM_THREADS max(min_t(unsigned long, MDT_MAX_THREADS, \
- num_physpages >> (25 - PAGE_SHIFT)), 2UL)
+ num_physpages >> (25 - CFS_PAGE_SHIFT)), 2UL)
#define SEQ_NUM_THREADS max(min_t(unsigned long, MDT_MAX_THREADS, \
- num_physpages >> (25 - PAGE_SHIFT)), 2UL)
+ num_physpages >> (25 - CFS_PAGE_SHIFT)), 2UL)
/* Absolute limits */
#define MDS_THREADS_MIN 2
diff --git a/lustre/ldlm/ldlm_pool.c b/lustre/ldlm/ldlm_pool.c
index dcae25431d..fb9a508b87 100644
--- a/lustre/ldlm/ldlm_pool.c
+++ b/lustre/ldlm/ldlm_pool.c
@@ -99,7 +99,7 @@
#ifdef HAVE_LRU_RESIZE_SUPPORT
/* 50 ldlm locks for 1MB of RAM. */
-#define LDLM_POOL_HOST_L ((num_physpages >> (20 - PAGE_SHIFT)) * 50)
+#define LDLM_POOL_HOST_L ((num_physpages >> (20 - CFS_PAGE_SHIFT)) * 50)
/* Default step in % for grant plan. */
#define LDLM_POOL_GSP (10)
diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 56c48ff35a..3a02565a33 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -490,7 +490,7 @@ static inline int ldlm_req_handles_avail(int req_size, int off)
{
int avail;
- avail = min_t(int, LDLM_MAXREQSIZE, PAGE_SIZE - 512) - req_size;
+ avail = min_t(int, LDLM_MAXREQSIZE, CFS_PAGE_SIZE - 512) - req_size;
avail /= sizeof(struct lustre_handle);
avail += LDLM_LOCKREQ_HANDLES - off;
diff --git a/lustre/liblustre/tests/sanity.c b/lustre/liblustre/tests/sanity.c
index aafc5e66e6..7056d58d30 100644
--- a/lustre/liblustre/tests/sanity.c
+++ b/lustre/liblustre/tests/sanity.c
@@ -878,14 +878,14 @@ static int pages_io(int xfer, loff_t pos)
/* create sample data */
for (i = 0, buf = buf_alloc; i < _npages; i++) {
- for (j = 0; j < PAGE_SIZE/sizeof(int); j++, buf++) {
+ for (j = 0; j < CFS_PAGE_SIZE/sizeof(int); j++, buf++) {
*buf = rand();
}
}
/* compute checksum */
for (i = 0, buf = buf_alloc; i < _npages; i++) {
- for (j = 0; j < PAGE_SIZE/sizeof(int); j++, buf++) {
+ for (j = 0; j < CFS_PAGE_SIZE/sizeof(int); j++, buf++) {
check_sum[i] += *buf;
}
}
@@ -903,9 +903,9 @@ static int pages_io(int xfer, loff_t pos)
}
gettimeofday(&tw1, NULL);
for (i = 0, buf = buf_alloc; i < _npages;
- i += xfer, buf += xfer * PAGE_SIZE / sizeof(int)) {
- rc = write(fd, buf, PAGE_SIZE * xfer);
- if (rc != PAGE_SIZE * xfer) {
+ i += xfer, buf += xfer * CFS_PAGE_SIZE / sizeof(int)) {
+ rc = write(fd, buf, CFS_PAGE_SIZE * xfer);
+ if (rc != CFS_PAGE_SIZE * xfer) {
printf("write error (i %d, rc %d): %s\n", i, rc,
strerror(errno));
return(1);
@@ -923,9 +923,9 @@ static int pages_io(int xfer, loff_t pos)
}
gettimeofday(&tr1, NULL);
for (i = 0, buf = buf_alloc; i < _npages;
- i += xfer, buf += xfer * PAGE_SIZE / sizeof(int)) {
- rc = read(fd, buf, PAGE_SIZE * xfer);
- if (rc != PAGE_SIZE * xfer) {
+ i += xfer, buf += xfer * CFS_PAGE_SIZE / sizeof(int)) {
+ rc = read(fd, buf, CFS_PAGE_SIZE * xfer);
+ if (rc != CFS_PAGE_SIZE * xfer) {
printf("read error (i %d, rc %d): %s\n", i, rc,
strerror(errno));
return(1);
@@ -936,7 +936,7 @@ static int pages_io(int xfer, loff_t pos)
/* compute checksum */
for (i = 0, buf = buf_alloc; i < _npages; i++) {
int sum = 0;
- for (j = 0; j < PAGE_SIZE/sizeof(int); j++, buf++) {
+ for (j = 0; j < CFS_PAGE_SIZE/sizeof(int); j++, buf++) {
sum += *buf;
}
if (sum != check_sum[i]) {
@@ -951,8 +951,8 @@ static int pages_io(int xfer, loff_t pos)
tw = (tw2.tv_sec - tw1.tv_sec) * 1000000 + (tw2.tv_usec - tw1.tv_usec);
tr = (tr2.tv_sec - tr1.tv_sec) * 1000000 + (tr2.tv_usec - tr1.tv_usec);
printf(" (R:%.3fM/s, W:%.3fM/s)\n",
- (_npages * PAGE_SIZE) / (tw / 1000000.0) / (1024 * 1024),
- (_npages * PAGE_SIZE) / (tr / 1000000.0) / (1024 * 1024));
+ (_npages * CFS_PAGE_SIZE) / (tw / 1000000.0) / (1024 * 1024),
+ (_npages * CFS_PAGE_SIZE) / (tr / 1000000.0) / (1024 * 1024));
if (data_error)
return 1;
@@ -1467,7 +1467,7 @@ int main(int argc, char * const argv[])
__liblustre_setup_();
- buf_size = _npages * PAGE_SIZE;
+ buf_size = _npages * CFS_PAGE_SIZE;
if (opt_verbose)
printf("allocating %d bytes buffer\n", buf_size);
buf_alloc = calloc(1, buf_size);
diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index fef69969c7..ccc6a0cb7f 100644
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -772,7 +772,7 @@ static int __init lvfs_linux_init(void)
{
ENTRY;
#if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__)
- lvfs_memdbg_init(PAGE_SIZE);
+ lvfs_memdbg_init(CFS_PAGE_SIZE);
#endif
RETURN(0);
}
diff --git a/lustre/obdclass/capa.c b/lustre/obdclass/capa.c
index 747ac69503..2bbc687db5 100644
--- a/lustre/obdclass/capa.c
+++ b/lustre/obdclass/capa.c
@@ -74,11 +74,11 @@ struct hlist_head *init_capa_hash(void)
struct hlist_head *hash;
int nr_hash, i;
- OBD_ALLOC(hash, PAGE_SIZE);
+ OBD_ALLOC(hash, CFS_PAGE_SIZE);
if (!hash)
return NULL;
- nr_hash = PAGE_SIZE / sizeof(struct hlist_head);
+ nr_hash = CFS_PAGE_SIZE / sizeof(struct hlist_head);
LASSERT(nr_hash > NR_CAPAHASH);
for (i = 0; i < NR_CAPAHASH; i++)
@@ -114,7 +114,7 @@ void cleanup_capa_hash(struct hlist_head *hash)
}
spin_unlock(&capa_lock);
- OBD_FREE(hash, PAGE_SIZE);
+ OBD_FREE(hash, CFS_PAGE_SIZE);
}
static inline int const capa_hashfn(struct lu_fid *fid)
@@ -236,7 +236,7 @@ int capa_hmac(__u8 *hmac, struct lustre_capa *capa, __u8 *key)
int keylen;
struct scatterlist sl = {
.page = virt_to_page(capa),
- .offset = (unsigned long)(capa) % PAGE_SIZE,
+ .offset = (unsigned long)(capa) % CFS_PAGE_SIZE,
.length = offsetof(struct lustre_capa, lc_hmac),
};
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 2a1fa8c511..b7a14f1648 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -444,7 +444,7 @@ static int get_per_page_niobufs(struct obd_ioobj *ioo, int nioo,
do {
obd_off poff = off & ~CFS_PAGE_MASK;
int pnob = (poff + nob > CFS_PAGE_SIZE) ?
- PAGE_SIZE - poff : nob;
+ CFS_PAGE_SIZE - poff : nob;
LASSERT(page < npages);
pp_rnb[page].len = pnob;
--
GitLab