diff --git a/[refs] b/[refs]
index 20fc5b22fecd..ee0747849c93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4891d53956abd4ad9d94127c50d931124319a324
+refs/heads/master: 5fe14c851efedf95b0e7652a3a7b93ec899d1599
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index dffe295825f4..1ad8c9fcc742 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -1089,8 +1089,10 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
 	struct kstat *stat)
 {
 	int err = cifs_revalidate(dentry);
-	if (!err)
+	if (!err) {
 		generic_fillattr(dentry->d_inode, stat);
+		stat->blksize = CIFS_MAX_MSGSIZE;
+	}
 	return err;
 }