Branch: b1_4

Initialize the blocksize for stat() for non-regular files.
b=6062

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 42187af..3c9f711 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -37,7 +37,8 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        - rmmod NALs that might be loaded because of /etc/modules.conf (6133)
        - support for mountfsoptions and clientoptions to the Lustre LDAP (5873)
        - improved "lustre status" script
-       
+       - initialize blocksize for non-regular files (6062)
+
 2005-03-22  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.1
        * bug fixes

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index e9b6b38..ad2b04b 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1250,6 +1250,9 @@ void ll_update_inode(struct inode *inode, struct mds_body *body,
                 inode->i_blksize = min(lsm->lsm_xfersize, LL_MAX_BLKSIZE);
                 if (lli->lli_smd != lsm)
                         obd_free_memmd(ll_i2obdexp(inode), &lsm);
+        } else {
+                inode->i_blksize = max(inode->i_blksize,
+                                       inode->i_sb->s_blocksize);
         }
 
         if (body->valid & OBD_MD_FLID)