Btrfs: Change st_blocksize to 4k

Some programs (python) do rwm cycles at the granularity returned by
stat.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 6e2d03626fb9e15c8f1c81d49e9893f8c8a52ee6..6d0cd9a7a615329bef40230753090dd5a64eb9e4 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2701,7 +2701,7 @@ static int btrfs_getattr(struct vfsmount *mnt,
 {
        struct inode *inode = dentry->d_inode;
        generic_fillattr(inode, stat);
-       stat->blksize = 256 * 1024;
+       stat->blksize = PAGE_CACHE_SIZE;
        return 0;
 }
 

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index e2b9b86af696d6868eb1014041e70c66716ed12f..08f19ec8809281e556ac5f4dbc6024478418d707 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -75,7 +75,14 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
        ret = btrfs_search_slot(trans, root, key, path, 0, 1);
        if (ret < 0)
                goto out;
-       BUG_ON(ret != 0);
+
+       if (ret != 0) {
+               btrfs_print_leaf(root, path->nodes[0]);
+               printk("unable to update root key %Lu %u %Lu\n",
+                      key->objectid, key->type, key->offset);
+               BUG_ON(1);
+       }
+
        l = path->nodes[0];
        slot = path->slots[0];
        ptr = btrfs_item_ptr_offset(l, slot);