From 07c45f316ce159e64eb4cb6fb343da7e15646881 Mon Sep 17 00:00:00 2001
From: Takashi Sato <sho@tnes.nec.co.jp>
Date: Mon, 28 Jan 2008 23:58:27 -0500
Subject: [PATCH] --- yaml --- r: 77870 b: refs/heads/master c:
 afc7cbca5bfd556c3e12d3acefbee5ab0cbd4670 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/ext4/super.c         | 5 +++++
 trunk/fs/ocfs2/cluster/sys.c  | 2 +-
 trunk/include/linux/ext4_fs.h | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 73addb60e631..981b141c5b74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b11d8179d1c6e560edc02c40a53b65fde83bf3f
+refs/heads/master: afc7cbca5bfd556c3e12d3acefbee5ab0cbd4670
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 1ca0f546c466..ab7010dde1b5 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -1624,6 +1624,11 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
 		goto out_fail;
 	}
 
+	if (!sb_set_blocksize(sb, blocksize)) {
+		printk(KERN_ERR "EXT4-fs: bad blocksize %d.\n", blocksize);
+		goto out_fail;
+	}
+
 	/*
 	 * The ext4 superblock will not be buffer aligned for other than 1kB
 	 * block sizes.  We need to calculate the offset from buffer start.
diff --git a/trunk/fs/ocfs2/cluster/sys.c b/trunk/fs/ocfs2/cluster/sys.c
index 0c095ce7723d..a4b07730b2e1 100644
--- a/trunk/fs/ocfs2/cluster/sys.c
+++ b/trunk/fs/ocfs2/cluster/sys.c
@@ -64,7 +64,7 @@ int o2cb_sys_init(void)
 {
 	int ret;
 
-	o2cb_kset = kset_create_and_add("o2cb", NULL, NULL);
+	o2cb_kset = kset_create_and_add("o2cb", NULL, fs_kobj);
 	if (!o2cb_kset)
 		return -ENOMEM;
 
diff --git a/trunk/include/linux/ext4_fs.h b/trunk/include/linux/ext4_fs.h
index 97dd409d5f4a..dfe4487fc739 100644
--- a/trunk/include/linux/ext4_fs.h
+++ b/trunk/include/linux/ext4_fs.h
@@ -73,8 +73,8 @@
  * Macro-instructions used to manage several block sizes
  */
 #define EXT4_MIN_BLOCK_SIZE		1024
-#define	EXT4_MAX_BLOCK_SIZE		4096
-#define EXT4_MIN_BLOCK_LOG_SIZE		  10
+#define	EXT4_MAX_BLOCK_SIZE		65536
+#define EXT4_MIN_BLOCK_LOG_SIZE		10
 #ifdef __KERNEL__
 # define EXT4_BLOCK_SIZE(s)		((s)->s_blocksize)
 #else