X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fll_dirstripe_verify.c;h=77c551288394556174c3047797179530e69cc43c;hb=046a84322d459190fed4644104d784df74219c4b;hp=2c92091790654ebb2fbde475c49ed970f64a90d0;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lustre/tests/ll_dirstripe_verify.c b/lustre/tests/ll_dirstripe_verify.c
index 2c92091..77c5512 100644
--- a/lustre/tests/ll_dirstripe_verify.c
+++ b/lustre/tests/ll_dirstripe_verify.c
@@ -114,22 +114,20 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
         int i;
         FILE *fp;
 
-        fp = popen("\\ls -d  /proc/fs/lustre/lov/*clilov* | head -1", "r");
+        fp = popen("\\ls -d  /proc/fs/lustre/lov/*lov* | head -1", "r");
         if (!fp) {
                 llapi_err(LLAPI_MSG_ERROR,
-                          "open(lustre/lov/*clilov*) failed: %s\n");
+                          "open(lustre/lov/*lov*) failed: %s\n");
                 return 2;
         }
         if (fscanf(fp, "%s", lov_path) < 1) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "read(lustre/lov/*clilov*) failed: %s\n");
+                llapi_err(LLAPI_MSG_ERROR,"read lustre/lov/*lov* failed: %s\n");
                 pclose(fp);
                 return 3;
         }
         pclose(fp);
 
-        snprintf(tmp_path, sizeof(tmp_path) - 1, "%s/stripecount",
-                 lov_path);
+        snprintf(tmp_path, sizeof(tmp_path) - 1, "%s/stripecount", lov_path);
         if (read_proc_entry(tmp_path, buf, sizeof(buf)) < 0)
                 return 5;
         def_stripe_count = (short)atoi(buf);
@@ -143,14 +141,13 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
                 stripe_count = def_stripe_count;
                 min_stripe_count = -1;
         } else {
-                stripe_count = (signed short)lum_dir->lmm_stripe_count;
+                stripe_count = (short)lum_dir->lmm_stripe_count;
                 printf("dir stripe %d, ", stripe_count);
                 min_stripe_count = 1;
         }
 
         printf("default stripe %d, ost count %d\n",
                def_stripe_count, ost_count);
-
         if (stripe_count == 0) {
                 min_stripe_count = -1;
                 stripe_count = 1;
@@ -169,8 +166,8 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
         }
 
         if (lum_file1->lmm_stripe_count < stripe_count)
-                llapi_err(LLAPI_MSG_WARN, "warning: file1 used fewer stripes"
-                          " %d < dir %d (likely due to bug 4900)\n",
+                llapi_err(LLAPI_MSG_WARN, "warning: file1 used fewer stripes "
+                          "%d < dir %d (likely due to bug 4900)\n",
                           lum_file1->lmm_stripe_count, stripe_count);
 
         if (lum_dir != NULL)
@@ -210,7 +207,8 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
                 if (idx != next) {
                         llapi_err(LLAPI_MSG_WARN, "warning: non-sequential "
                                   "file1 stripe[%d] %d != file2 stripe[0] %d\n",
-                                  stripe, lum_file1->lmm_objects[stripe].l_ost_idx,
+                                  stripe,
+                                  lum_file1->lmm_objects[stripe].l_ost_idx,
                                   idx);
                 }
         }
@@ -240,7 +238,7 @@ int main(int argc, char **argv)
                 return rc;
         }
 
-        lum_size = lov_mds_md_size(MAX_LOV_UUID_COUNT);
+        lum_size = lov_mds_md_size(MAX_LOV_UUID_COUNT, LOV_MAGIC);
         if ((lum_dir = (struct lov_user_md *)malloc(lum_size)) == NULL) {
                 rc = ENOMEM;
                 llapi_err(LLAPI_MSG_ERROR, "error: can't allocate %d bytes "