merge HEAD to b_io branch. (seems quite a large changes from

b_md and b_recover)

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 77c3039..12b7d52 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -24,7 +24,9 @@ noinst_SCRIPTS += fs.sh intent-test.sh intent-test2.sh leak_finder.pl \
        runtests runvmstat snaprun.sh tbox.sh  common.sh
 noinst_PROGRAMS = openunlink testreq truncate directio openme writeme mcreate
 noinst_PROGRAMS += munlink tchmod toexcl fsx test_brw openclose createdestroy
-noinst_PROGRAMS += lovstripe stat createmany mkdirmany multifstat # ldaptest 
+noinst_PROGRAMS += lovstripe stat createmany mkdirmany multifstat
+# noinst_PROGRAMS += ldaptest 
+noinst_PROGRAMS += checkstat
 
 # ldaptest_SOURCES = ldaptest.c
 tchmod_SOURCES = tchmod.c
@@ -46,5 +48,6 @@ stat_SOURCES = stat.c
 createmany_SOURCES = createmany.c
 mkdirmany_SOURCES = mkdirmany.c
 multifstat_SOURCES = multifstat.c
+checkstat_SOURCES = checkstat.c
 
 include $(top_srcdir)/Rules

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 4a3b336..ba22a9e 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -810,7 +810,8 @@ int jt_obd_setup(int argc, char **argv)
 
 /* The ioctl API has been extended to provide the LOV stripe metadata to the
  * caller when applicable.  This utility, however, only saves the LSM for the
- * latest CREATE. */
+ * latest CREATE.   It only saves the LSM when the ioctl indicates that it
+ * is valid by overloading 'ioc_conn2' as a boolean. */
 int jt_obd_create(int argc, char **argv)
 {
         struct obd_ioctl_data data;
@@ -880,7 +881,7 @@ int jt_obd_create(int argc, char **argv)
                         break;
                 }
 
-                lsm_valid = 1;
+                lsm_valid = data.ioc_conn2;
 
                 if (be_verbose(verbose, &next_time, i, &next_count, count))
                         printf("%s: #%d is object id "LPX64"\n",