Branch HEAD

b=20054
i=girish
i=ericm

Fix lfs getstripe to print the stripe data.

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index f62ae65..1620014 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2687,7 +2687,7 @@ get_stripe_info() {
 
        stripe_size=`awk '$1 ~ /size/ {print $2}' $tmp_file`
        stripe_count=`awk '$1 ~ /count/ {print $2}' $tmp_file`
 
        stripe_size=`awk '$1 ~ /size/ {print $2}' $tmp_file`
        stripe_count=`awk '$1 ~ /count/ {print $2}' $tmp_file`

-       stripe_index=`awk '/obdidx/ {start = 1; getline; print $1; exit}' $tmp_file`
+       stripe_index=`awk '$1 ~ /stripe_offset/ {print $2}' $tmp_file`

        rm -f $tmp_file
 }
 
        rm -f $tmp_file
 }
 

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index c0d96be..879794e 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -932,7 +932,7 @@ void lov_dump_user_lmm_v1v3(struct lov_user_md *lum, char *pool_name,
                 lov_dump_user_lmm_header(lum, NULL, is_dir, header, quiet,
                                          pool_name);
 
                 lov_dump_user_lmm_header(lum, NULL, is_dir, header, quiet,
                                          pool_name);
 

-        if (body && !(header && VERBOSE_ALL)) {
+        if (body) {

                 if ((!quiet) && (obdstripe == 1))
                         llapi_printf(LLAPI_MSG_NORMAL,
                                      "\tobdidx\t\t objid\t\tobjid\t\t group\n");
                 if ((!quiet) && (obdstripe == 1))
                         llapi_printf(LLAPI_MSG_NORMAL,
                                      "\tobdidx\t\t objid\t\tobjid\t\t group\n");


@@ -979,7 +979,7 @@ void lov_dump_user_lmm_join(struct lov_user_md_v1 *lum, char *path,
                              lumj->lmm_extent_count);
         }
 
                              lumj->lmm_extent_count);
         }
 

-        if (body && !(header && VERBOSE_ALL)) {
+        if (body) {

                 unsigned long long start = -1, end = 0;
                 if (!quiet && obdstripe == 1)
                         llapi_printf(LLAPI_MSG_NORMAL,
                 unsigned long long start = -1, end = 0;
                 if (!quiet && obdstripe == 1)
                         llapi_printf(LLAPI_MSG_NORMAL,