revert from b1_8

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index ef31788..396b9fb 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -37,13 +37,6 @@ tbd Sun Microsystems, Inc.
          For more information, please refer to bugzilla 13904.
 
 Severity   : normal
-Bugzilla   : 16318
-Frequency  : rare, on PPC clients
-Description: not swab ost objects in response about directory, because
-             this not exist.
-Details    : bug similar bug 14856, but in different function.
-
-Severity   : normal
 Bugzilla   : 16037
 Description: Client runs out of low memory
 Details    : Consider only lowmem when counting initial number of llap pages

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 616bf76..2487e6a 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -2056,10 +2056,7 @@ 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);
-                        /* 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);
+                        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);
                 }