don't swab ost objects in response about directory, because

this not exist.

Branch b1_6
b=16318
i=johann
i=deen

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 719e863..2d9fb85 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -38,6 +38,13 @@ tbd Sun Microsystems, Inc.
        * Output of lfs quota has been made less detailed by default,
          old (verbose) output can be obtained by using -v option.
 
+Severity   : normal
+Bugzilla   : 16318
+Frequency  : rare, on PPC clients
+Description: don't swab ost objects in response about directory, because
+             this not exist.
+Details    : bug similar bug 14856, but in different function.
+
 Severity   : enhancement
 Bugzilla   : 15754
 Description: lfs quota tool enhancements

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 36f15fb..fd8c8b0 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -2057,7 +2057,10 @@ int ll_lov_getstripe_ea_info(struct inode *inode, const char *filename,
         if (LOV_MAGIC != cpu_to_le32(LOV_MAGIC)) {
                 if (lmm->lmm_magic == cpu_to_le32(LOV_MAGIC)) {
                         lustre_swab_lov_user_md((struct lov_user_md *)lmm);
-                        lustre_swab_lov_user_md_objects((struct lov_user_md *)lmm);
+                        /* if function called for directory - we should be
+                         * avoid swab not existent lsm objects */
+                        if (S_ISREG(body->mode))
+                                lustre_swab_lov_user_md_objects((struct lov_user_md *)lmm);
                 } else if (lmm->lmm_magic == cpu_to_le32(LOV_MAGIC_JOIN)) {
                         lustre_swab_lov_user_md_join((struct lov_user_md_join *)lmm);
                 }