- another attempt to get the blocksize right

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 09e2bba..3d91ae6 100644 (file)
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -119,8 +119,7 @@ int waitfor_one_page(struct page *page)
  */
 static inline unsigned ext2_chunk_size(struct inode *inode)
 {
-        //return inode->i_sb->s_blocksize;
-        return PAGE_CACHE_SIZE;
+        return inode->i_sb->s_blocksize;
 }
 
 static inline void ext2_put_page(struct page *page)

diff --git a/lustre/llite/super.c b/lustre/llite/super.c
index 000502a..1f4dacb 100644 (file)
--- a/lustre/llite/super.c
+++ b/lustre/llite/super.c
@@ -159,8 +159,10 @@ static struct super_block * ll_read_super(struct super_block *sb,
         sbi->ll_rootino = rootfid.id;
 
         sb->s_maxbytes = 1ULL << 36;
-        sb->s_blocksize = PAGE_SIZE;
-        sb->s_blocksize_bits = (unsigned char)PAGE_SHIFT;
+        /* XXX get this with a get_info call (like we have in OBDFS),
+           this info call should return the blocksize of the MDS */
+        sb->s_blocksize = 4096;
+        sb->s_blocksize_bits = 12;
         sb->s_magic = LL_SUPER_MAGIC;
         sb->s_op = &ll_super_operations;