Update from HEAD

diff --git a/lustre/kernel_patches/series/rh-2.4.22 b/lustre/kernel_patches/series/rh-2.4.22
index a4ce33d..2b01f1f 100644 (file)
--- a/lustre/kernel_patches/series/rh-2.4.22
+++ b/lustre/kernel_patches/series/rh-2.4.22
@@ -27,3 +27,5 @@ listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
 gfp_memalloc-2.4.22.patch
 ext3-xattr-ptr-arith-fix.patch
+procfs-ndynamic-2.4.patch
+kernel_text_address-2.4.18-chaos.patch

diff --git a/lustre/kernel_patches/series/suse-2.4.21 b/lustre/kernel_patches/series/suse-2.4.21
index 715ff2c..b8da362 100644 (file)
--- a/lustre/kernel_patches/series/suse-2.4.21
+++ b/lustre/kernel_patches/series/suse-2.4.21
@@ -29,3 +29,4 @@ listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
 gfp_memalloc-2.4.22.patch
 ext3-xattr-ptr-arith-fix.patch
+procfs-ndynamic-2.4.patch

diff --git a/lustre/kernel_patches/series/vanilla-2.4.19-pre1 b/lustre/kernel_patches/series/vanilla-2.4.19-pre1
index 9551189..e3124b7 100644 (file)
--- a/lustre/kernel_patches/series/vanilla-2.4.19-pre1
+++ b/lustre/kernel_patches/series/vanilla-2.4.19-pre1
@@ -22,7 +22,7 @@ ext3-san-2.4.20.patch
 ext3-map_inode_page.patch
 ext3-error-export.patch
 iopen-2.4.20.patch
-tcp-zero-copy.patch
+tcp-zero-copy-2.4.19-pre1.patch 
 jbd-dont-account-blocks-twice.patch
 jbd-commit-tricks.patch
 ext3-no-write-super.patch
@@ -44,3 +44,4 @@ kdev-2.4.19-pre1.patch
 resched-2.4.19-pre1.patch
 ext3-xattr-ptr-arith-fix.patch
 gfp_memalloc-2.4.22.patch
+vmalloc_to_page-2.4.19-pre1.patch 

diff --git a/lustre/tests/cfg/insanity-local.sh b/lustre/tests/cfg/insanity-local.sh
index 688d5e1..0c99215 100644 (file)
--- a/lustre/tests/cfg/insanity-local.sh
+++ b/lustre/tests/cfg/insanity-local.sh
@@ -10,6 +10,7 @@ FAIL_CLIENTS=${FAIL_CLIENTS:-""}
 NETTYPE=${NETTYPE:-tcp}
 TIMEOUT=${TIMEOUT:-30}
 PTLDEBUG=${PTLDEBUG:-0}
+SUBSYSTEM=${SUBSYSTEM:-0}
 MOUNT=${MOUNT:-"/mnt/lustre"}
 #CLIENT_UPCALL=${CLIENT_UPCALL:-`pwd`/client-upcall-mdev.sh}
 UPCALL=${CLIENT_UPCALL:-`pwd`/replay-single-upcall.sh}

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index cb07fa4..cdeeee9 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -219,6 +219,10 @@ static int get_obd_uuids(DIR *dir, char *dname, struct find_param *param)
                                 break;
                         }
                 }
+                if (param->obdindex == OBD_NOT_FOUND) {
+                        printf("unknown obduuid: %s\n", param->obduuid);
+                        return EINVAL;
+                }
         } else if (!param->quiet) {
                 printf("OBDS:\n");
                 for (i = 0, uuidp = param->uuids; i < obdcount; i++, uuidp++)
@@ -231,21 +235,23 @@ static int get_obd_uuids(DIR *dir, char *dname, struct find_param *param)
 void lov_dump_user_lmm_v1(struct lov_user_md_v1 *lum, char *dname, char *fname,
                           int obdindex, int quiet, int header, int body)
 {
-        int i;
+        int i, obdstripe = 0;
 
         if (obdindex != OBD_NOT_FOUND) {
                 for (i = 0; i < lum->lmm_stripe_count; i++) {
                         if (obdindex == lum->lmm_objects[i].l_ost_idx) {
                                 printf("%s/%s\n", dname, fname);
+                                obdstripe = 1;
                                 break;
                         }
                 }
         } else if (!quiet) {
                 printf("%s/%s\n", dname, fname);
+                obdstripe = 1;
         }
 
-        if (header) {
-                printf("lmm_magic:          0x%80X\n",  lum->lmm_magic);
+        if (header && (obdstripe == 1)) {
+                printf("lmm_magic:          0x%08X\n",  lum->lmm_magic);
                 printf("lmm_object_gr:      "LPX64"\n", lum->lmm_object_gr);
                 printf("lmm_object_id:      "LPX64"\n", lum->lmm_object_id);
                 printf("lmm_stripe_count:   %u\n", (int)lum->lmm_stripe_count);
@@ -256,15 +262,17 @@ void lov_dump_user_lmm_v1(struct lov_user_md_v1 *lum, char *dname, char *fname,
         if (body) {
                 long long oid;
 
-                if (!quiet)
+                if ((!quiet) && (obdstripe == 1))
                         printf("\tobdidx\t\t objid\t\tobjid\t\t group\n");
 
                 for (i = 0; i < lum->lmm_stripe_count; i++) {
                         int idx = lum->lmm_objects[i].l_ost_idx;
                         oid = lum->lmm_objects[i].l_object_id;
-                        printf("\t%6u\t%14llu\t%#13llx\t%14lld%s\n", idx, oid,
-                               oid, (long long)lum->lmm_objects[i].l_object_gr,
-                               obdindex == idx ? " *" : "");
+                        if ((obdindex == OBD_NOT_FOUND) || (obdindex == idx))
+                                printf("\t%6u\t%14llu\t%#13llx\t%14lld%s\n",
+                                       idx, oid, oid, 
+                                       (long long)lum->lmm_objects[i].l_object_gr,
+                                       obdindex == idx ? " *" : "");
                 }
                 printf("\n");
         }