summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-01-03 20:51:00 +0100
committerChris Mason <chris.mason@oracle.com>2008-09-25 17:03:59 +0200
commitd666746207a01546e55bdaa4b721d1890faaf6e8 (patch)
tree9ed65e121a44aace7364551b6b607e098a590770 /fs
parentBtrfs: Properly handle overlapping extent in shrink_extent_tree (diff)
downloadlinux-d666746207a01546e55bdaa4b721d1890faaf6e8.tar.xz
linux-d666746207a01546e55bdaa4b721d1890faaf6e8.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/inode.c2
-rw-r--r--fs/btrfs/root-tree.c9
2 files changed, 9 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 6e2d03626fb9..6d0cd9a7a615 100644
--- 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 e2b9b86af696..08f19ec88092 100644
--- 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);