merge three weeks of b_devel fixes into b_filterio

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index f1d1b27..3df3cf0 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -210,7 +210,7 @@ void obdo_refresh_inode(struct inode *dst, struct obdo *src, obd_flag valid)
         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)
+        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)