b=1598

Merge final read performance fix into b_devel

diff --git a/lustre/llite/iod.c b/lustre/llite/iod.c
index eeb307a..33dc388 100644 (file)
--- a/lustre/llite/iod.c
+++ b/lustre/llite/iod.c
@@ -163,9 +163,11 @@ static void ll_writeback(struct inode *inode, struct obdo *oa,
                                    llwp->pga, set, NULL);
                 if (rc == 0)
                         rc = ptlrpc_set_wait(set);
-                if (rc == 0)
-                        obdo_refresh_inode(inode, oa,
-                                           oa->o_valid & ~OBD_MD_FLSIZE);
+                if (rc == 0) {
+                        /* bug 1598: don't clobber blksize */
+                        oa->o_valid &= ~(OBD_MD_FLSIZE | OBD_MD_FLBLKSZ);
+                        obdo_refresh_inode(inode, oa, oa->o_valid);
+                }
                 ptlrpc_set_destroy(set);
         }
         /*