* Merged b_devel updates

diff --git a/lustre/kernel_patches/pc/vfs_intent-2.4.18-18.pc b/lustre/kernel_patches/pc/vfs_intent-2.4.18-18.pc
index 8801aa7..adb8100 100644 (file)
--- a/lustre/kernel_patches/pc/vfs_intent-2.4.18-18.pc
+++ b/lustre/kernel_patches/pc/vfs_intent-2.4.18-18.pc
@@ -1,10 +1,12 @@
+fs/exec.c
 fs/dcache.c
+fs/namespace.c
 fs/namei.c
-fs/nfsd/vfs.c
 fs/open.c
-fs/proc/base.c
 fs/stat.c
-fs/exec.c
+fs/proc/base.c
 include/linux/dcache.h
 include/linux/fs.h
+kernel/fork.c
+kernel/exit.c
 kernel/ksyms.c

diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c
index 016354c..5987d2e 100644 (file)
--- a/lustre/obdclass/lustre_peer.c
+++ b/lustre/obdclass/lustre_peer.c
@@ -64,8 +64,8 @@ void class_exit_uuidlist(void)
                 struct uuid_nid_data *data =
                         list_entry(tmp, struct uuid_nid_data, head);
 
-                PORTAL_FREE(data->uuid, strlen(data->uuid) + 1);
-                PORTAL_FREE(data, sizeof(*data));
+                OBD_FREE(data->uuid, strlen(data->uuid) + 1);
+                OBD_FREE(data, sizeof(*data));
         }
 }
 
@@ -109,11 +109,11 @@ int class_add_uuid(char *uuid, __u64 nid, __u32 nal)
         }
 
         rc = -ENOMEM;
-        PORTAL_ALLOC(data, sizeof(*data));
+        OBD_ALLOC(data, sizeof(*data));
         if (data == NULL)
                 goto fail_0;
 
-        PORTAL_ALLOC(data->uuid, nob);
+        OBD_ALLOC(data->uuid, nob);
         if (data == NULL)
                 goto fail_1;
 
@@ -131,7 +131,7 @@ int class_add_uuid(char *uuid, __u64 nid, __u32 nal)
         return 0;
 
  fail_1:
-        PORTAL_FREE (data, sizeof (*data));
+        OBD_FREE (data, sizeof (*data));
  fail_0:
         kportal_put_ni (nal);
         return (rc);
@@ -171,8 +171,8 @@ int class_del_uuid (char *uuid)
                 list_del (&data->head);
 
                 kportal_put_ni (data->nal);
-                PORTAL_FREE(data->uuid, strlen(data->uuid) + 1);
-                PORTAL_FREE(data, sizeof(*data));
+                OBD_FREE(data->uuid, strlen(data->uuid) + 1);
+                OBD_FREE(data, sizeof(*data));
         } while (!list_empty (&deathrow));
 
         return 0;

diff --git a/lustre/tests/recovery-cleanup.sh b/lustre/tests/recovery-cleanup.sh
index c8f85ee..fefd2d6 100755 (executable)
--- a/lustre/tests/recovery-cleanup.sh
+++ b/lustre/tests/recovery-cleanup.sh
@@ -22,9 +22,10 @@ CLIENT=${CLIENT:-mdev8}
 NETWORKTYPE=${NETWORKTYPE:-tcp}
 MOUNTPT=${MOUNTPT:-/mnt/lustre}
 CONFIG=${CONFIG:-recovery-cleanup.xml}
-MDSDEV=${MDSDEV:-/tmp/mds}
-OSTDEV=${OSTDEV:-/tmp/ost}
+MDSDEV=${MDSDEV:-/tmp/mds-`hostname`}
 MDSSIZE=${MDSSIZE:-100000}
+FSTYPE=${FSTYPE:-ext3}
+OSTDEV=${OSTDEV:-/tmp/ost-`hostname`}
 OSTSIZE=${OSTSIZE:-100000}
 
 do_mds() {
@@ -51,10 +52,10 @@ make_config() {
        lmc -m $CONFIG --add net --node $NODE --nid `h2$NETWORKTYPE $NODE` \
            --nettype $NETWORKTYPE || exit 4
     done
-    lmc -m $CONFIG --add mds --node $MDSNODE --mds mds1 --dev $MDSDEV \
-        --size $MDSSIZE || exit 5
-    lmc -m $CONFIG --add ost --node $OSTNODE --ost ost1 --dev $OSTDEV \
-        --size $OSTSIZE || exit 6
+    lmc -m $CONFIG --add mds --node $MDSNODE --mds mds1 --fstype $FSTYPE \
+       --dev $MDSDEV --size $MDSSIZE || exit 5
+    lmc -m $CONFIG --add ost --node $OSTNODE --ost ost1 --fstype $FSTYPE \
+       --dev $OSTDEV --size $OSTSIZE || exit 6
     lmc -m $CONFIG --add mtpt --node $CLIENT --path $MOUNTPT --mds mds1 \
         --ost ost1 || exit 7
 }