diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c79cb6a0ddf24bfb5bc09e0db2bc9b1873f82647..bd26bb70221a122460d311ecddc4e53f60bc25a3 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -4,7 +4,7 @@ tbd Sun Microsystems, Inc.
2.6.5-7.311 (SLES 9),
2.6.9-67.0.15.EL (RHEL 4),
2.6.16.54-0.2.5 (SLES 10),
- 2.6.18-53.1.19.el5 (RHEL 5),
+ 2.6.18-53.1.21.el5 (RHEL 5),
2.6.22.14 vanilla (kernel.org)
* Client support for unpatched kernels:
(see http://wiki.lustre.org/index.php?title=Patchless_Client)
@@ -24,6 +24,10 @@ tbd Sun Microsystems, Inc.
'tunefs.lustre --param="mdt.quota_type=ug1" $MDTDEV'.
For more information, please refer to bugzilla 13904.
+Severity : enhancement
+Bugzilla : 15865
+Description: Update to RHEL5 kernel-2.6.18-53.1.21.el5.
+
Severity : major
Bugzilla : 15924
Description: do not process already freed flock
diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index bca6ca7278e0795fa80f1420b5b25e4a5ccd675a..ccaa05e9cfb60057e99ebb87e319a1fad3f52aca 100644
--- a/lustre/kernel_patches/targets/2.6-rhel5.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in
@@ -1,5 +1,5 @@
lnxmaj="2.6.18"
-lnxrel="53.1.19.el5"
+lnxrel="53.1.21.el5"
KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
SERIES=2.6-rhel5.series
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index d49f66359f1ca2bad93509de1f4302171151f97b..fbaf0eb92bed6984579ebe883ccfacd6999e1d0d 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -5,7 +5,7 @@ SUPPORTED KERNELS:
2.6-suse-newer SLES9: 2.6.5-7.311 extra patches for SLES9 after SP1
2.6-rhel4 RHEL4: 2.6.9-67.0.15.EL
2.6-sles10 SLES10: 2.6.16.54-0.2.5
-2.6-rhel5 RHEL5: 2.6.18-53.1.19.el5
+2.6-rhel5 RHEL5: 2.6.18-53.1.21.el5
2.6.18-vanilla kernel.org: 2.6.18.8
2.6.22-vanilla kernel.org: 2.6.22.14
diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index ddedaeb60c8947cb169c65f2f72d3c87008442ae..75963f91424de74d7077c8659da9fdec3817e23f 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -511,7 +511,7 @@ cleanup:
static inline int ldlm_req_handles_avail(struct obd_export *exp,
int *size, int bufcount, int off)
{
- int avail = min_t(int, LDLM_MAXREQSIZE, PAGE_SIZE - 512);
+ int avail = min_t(int, LDLM_MAXREQSIZE, CFS_PAGE_SIZE - 512);
avail -= lustre_msg_size(class_exp2cliimp(exp)->imp_msg_magic,
bufcount, size);
diff --git a/lustre/liblustre/tests/sanity.c b/lustre/liblustre/tests/sanity.c
index 1ecb1e8ee6001294251fb194d591d9ebab3e4f4c..60ec9d9bea2240f3d80b4c3dfc7f4d9f23a23ef2 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;
@@ -1468,7 +1468,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);