From c84a45759704c2f99b232c9aa64c678705c2ff16 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Sat, 2 Oct 2004 00:58:35 +0000
Subject: [PATCH] Merge b1_4_smallfix from b1_4 (20041001_1227) - notify osc
 create thread that OSC is being cleaned up (4600) - add nettype argument for
 llmount in #5d in conf-sanity.sh (3936) - reconstruct ost_handle() like
 mds_handle() (4657) - let lconf resolve symlinked-to devices (4629) - don't
 unlink "objects" from directory with default EA (4554) - allocate qswnal tx
 descriptors singly to avoid fragmentation (4504) - allow more than 32000
 subdirectories in a single directory (3244) - OST returns ENOSPC from object
 create when no space left (4539) - limit OSC precreate to 1/2 of value OST
 considers bogus (4778) - bind to privileged port in socknal and tcpnal (3689)

---
 lustre/kernel_patches/targets/.cvsignore           |  1 +
 lustre/kernel_patches/targets/2.6-suse.target.in   | 17 ++++++++++++++++
 .../kernel_patches/targets/2.6-vanilla.target.in   | 15 ++++++++++++++
 .../kernel_patches/targets/hp_pnnl-2.4.target.in   | 16 +++++++++++++++
 lustre/kernel_patches/targets/rh-2.4.target.in     | 23 ++++++++++++++++++++++
 lustre/kernel_patches/targets/rhel-2.4.target.in   | 23 ++++++++++++++++++++++
 .../kernel_patches/targets/suse-2.4.21-2.target.in | 14 +++++++++++++
 lustre/lov/lov_merge.c                             |  8 ++------
 8 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100644 lustre/kernel_patches/targets/.cvsignore
 create mode 100644 lustre/kernel_patches/targets/2.6-suse.target.in
 create mode 100644 lustre/kernel_patches/targets/2.6-vanilla.target.in
 create mode 100644 lustre/kernel_patches/targets/hp_pnnl-2.4.target.in
 create mode 100644 lustre/kernel_patches/targets/rh-2.4.target.in
 create mode 100644 lustre/kernel_patches/targets/rhel-2.4.target.in
 create mode 100644 lustre/kernel_patches/targets/suse-2.4.21-2.target.in

diff --git a/lustre/kernel_patches/targets/.cvsignore b/lustre/kernel_patches/targets/.cvsignore
new file mode 100644
index 0000000..ba141e8
--- /dev/null
+++ b/lustre/kernel_patches/targets/.cvsignore
@@ -0,0 +1 @@
+*.target
diff --git a/lustre/kernel_patches/targets/2.6-suse.target.in b/lustre/kernel_patches/targets/2.6-suse.target.in
new file mode 100644
index 0000000..94a0f9c
--- /dev/null
+++ b/lustre/kernel_patches/targets/2.6-suse.target.in
@@ -0,0 +1,17 @@
+lnxmaj="2.6.4"
+lnxrel="51.0"
+
+KERNEL=linux-$lnxmaj-$lnxrel.tar.gz
+SERIES=2.6-suse.series
+VERSION=$lnxmaj
+EXTRA_VERSION=$lnxrel_lustre.@VERSION@
+RHBUILD=0
+LINUX26=1
+
+BASE_ARCHS="i686"
+BIGMEM_ARCHS=""
+BOOT_ARCHS=""
+JENSEN_ARCHS=""
+SMP_ARCHS="i686"
+UP_ARCHS=""
+SRC_ARCHS=""
diff --git a/lustre/kernel_patches/targets/2.6-vanilla.target.in b/lustre/kernel_patches/targets/2.6-vanilla.target.in
new file mode 100644
index 0000000..00c05df
--- /dev/null
+++ b/lustre/kernel_patches/targets/2.6-vanilla.target.in
@@ -0,0 +1,15 @@
+lnxmaj=2.6.6
+
+KERNEL=linux-$lnxmaj.tar.gz
+SERIES=2.6-vanilla
+VERSION=$lnxmaj
+EXTRA_VERSION=lustre.@VERSION@
+RHBUILD=0
+
+BASE_ARCHS=""
+BIGMEM_ARCHS=""
+BOOT_ARCHS=""
+JENSEN_ARCHS=""
+SMP_ARCHS=""
+UP_ARCHS=""
+SRC_ARCHS=""
diff --git a/lustre/kernel_patches/targets/hp_pnnl-2.4.target.in b/lustre/kernel_patches/targets/hp_pnnl-2.4.target.in
new file mode 100644
index 0000000..620e698
--- /dev/null
+++ b/lustre/kernel_patches/targets/hp_pnnl-2.4.target.in
@@ -0,0 +1,16 @@
+lnxmaj=2.4.20
+lnxrel=hp_pnnl
+
+KERNEL=linux-$lnxmaj-$lnxrel.tar.gz
+SERIES=hp-pnnl-2.4.20
+VERSION=$lnxmaj
+EXTRA_VERSION=$lnxrel_lustre.@VERSION@
+RHBUILD=0
+
+BASE_ARCHS="ia64"
+BIGMEM_ARCHS=""
+BOOT_ARCHS=""
+JENSEN_ARCHS=""
+SMP_ARCHS="ia64"
+UP_ARCHS=""
+SRC_ARCHS="ia64"
diff --git a/lustre/kernel_patches/targets/rh-2.4.target.in b/lustre/kernel_patches/targets/rh-2.4.target.in
new file mode 100644
index 0000000..fa9140d
--- /dev/null
+++ b/lustre/kernel_patches/targets/rh-2.4.target.in
@@ -0,0 +1,23 @@
+lnxmaj="2.4.20"
+lnxrel="31.9"
+
+KERNEL=linux-${lnxmaj}-${lnxrel}.tar.gz
+SERIES=rh-2.4.20
+VERSION=$lnxmaj
+EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
+RHBUILD=1
+
+BASE_ARCHS="i686"
+BIGMEM_ARCHS=""
+BOOT_ARCHS=""
+JENSEN_ARCHS=""
+SMP_ARCHS="i686"
+UP_ARCHS=""
+
+# the modules in this kernel do not build with gcc 3
+for cc in i386-redhat-linux-gcc-2.96 gcc296 gcc ; do
+    if which $cc >/dev/null 2>/dev/null ; then
+        CC=$cc
+        break
+    fi
+done
diff --git a/lustre/kernel_patches/targets/rhel-2.4.target.in b/lustre/kernel_patches/targets/rhel-2.4.target.in
new file mode 100644
index 0000000..10ca935
--- /dev/null
+++ b/lustre/kernel_patches/targets/rhel-2.4.target.in
@@ -0,0 +1,23 @@
+lnxmaj="2.4.21"
+lnxrel="20.EL"
+
+KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
+SERIES=rhel-2.4.21
+VERSION=${lnxmaj}
+EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
+RHBUILD=1
+
+BASE_ARCHS="i686"
+BIGMEM_ARCHS=""
+BOOT_ARCHS=""
+JENSEN_ARCHS=""
+SMP_ARCHS="i686"
+UP_ARCHS=""
+
+# the modules in this kernel do not build with gcc 3.3 or 2.96
+for cc in i386-redhat-linux-gcc-3.2.3 gcc32 gcc ; do
+    if which $cc >/dev/null 2>/dev/null ; then
+        export CC=$cc
+        break
+    fi
+done
diff --git a/lustre/kernel_patches/targets/suse-2.4.21-2.target.in b/lustre/kernel_patches/targets/suse-2.4.21-2.target.in
new file mode 100644
index 0000000..245c085
--- /dev/null
+++ b/lustre/kernel_patches/targets/suse-2.4.21-2.target.in
@@ -0,0 +1,14 @@
+KERNEL=linux-2.4.21-x86_64.tar.gz
+SERIES=suse-2.4.21-2
+VERSION=2.4.21
+EXTRA_VERSION=lustre.@VERSION@
+RHBUILD=0
+
+BASE_ARCHS="x86_64"
+BIGMEM_ARCHS=""
+BOOT_ARCH=""
+JENSEN_ARCHS=""
+SMP_ARCHS=""
+UP_ARCHS="x86_64"
+
+ARCH="x86_64"
diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index 3da1e10..71228be 100644
--- a/lustre/lov/lov_merge.c
+++ b/lustre/lov/lov_merge.c
@@ -70,10 +70,8 @@ __u64 lov_merge_blocks(struct lov_stripe_md *lsm)
         __u64 blocks = 0;
         int i;
 
-        for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count;
-             i++, loi++) {
+        for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++, loi++)
                 blocks += loi->loi_blocks;
-        }
         return blocks;
 }
 EXPORT_SYMBOL(lov_merge_blocks);
@@ -83,11 +81,9 @@ __u64 lov_merge_mtime(struct lov_stripe_md *lsm, __u64 current_time)
         struct lov_oinfo *loi;
         int i;
 
-        for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count;
-             i++, loi++) {
+        for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++, loi++)
                 if (loi->loi_mtime > current_time)
                         current_time = loi->loi_mtime;
-        }
         return current_time;
 }
 EXPORT_SYMBOL(lov_merge_mtime);
-- 
1.8.3.1