b=1598

Merge final read performance fix into b_devel

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index bae7e71..3df3cf0 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -209,8 +209,9 @@ 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;
-        /* Bug 1598: don't ever update i_blksize here; it needs to be managed
-         * by the LOV */
+        /* optimum IO size */
+        if (valid & OBD_MD_FLBLKSZ && src->o_blksize > dst->i_blksize)
+                dst->i_blksize = src->o_blksize;
         /* allocation of space */
         if (valid & OBD_MD_FLBLOCKS && src->o_blocks > dst->i_blocks)
                 dst->i_blocks = src->o_blocks;