From: phil <phil>
Date: Sun, 3 Aug 2003 20:57:17 +0000 (+0000)
Subject: merge HEAD into b_devel:
X-Git-Tag: v1_7_0_51~2^7~721
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9822c51a6448685a44e7938d7fa9b9441a82b0d1;p=fs%2Flustre-release.git

merge HEAD into b_devel:
 - fix for bug 1598
 - temporary flag-clearing until bug 974 is fixed
 - new GM nal
---

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index f1d1b27..bae7e71 100644
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -209,9 +209,8 @@ void obdo_refresh_inode(struct inode *dst, struct obdo *src, obd_flag valid)
                 LTIME_S(dst->i_ctime) = src->o_ctime;
         if (valid & OBD_MD_FLSIZE && src->o_size > dst->i_size)
                 dst->i_size = src->o_size;
-        /* optimum IO size */
-        if (valid & OBD_MD_FLBLKSZ)
-                dst->i_blksize = src->o_blksize;
+        /* Bug 1598: don't ever update i_blksize here; it needs to be managed
+         * by the LOV */
         /* allocation of space */
         if (valid & OBD_MD_FLBLOCKS && src->o_blocks > dst->i_blocks)
                 dst->i_blocks = src->o_blocks;