diff options
| author | Josef Bacik <josef@redhat.com> | 2010-10-14 14:52:27 -0400 |
|---|---|---|
| committer | Josef Bacik <josef@redhat.com> | 2010-10-22 15:54:55 -0400 |
| commit | 89a55897a2fbbceb94480952784004bf23911d38 (patch) | |
| tree | e62ea1ced4c7941ab53e7aa7047ce8f0af0add9f /fs/btrfs/super.c | |
| parent | bf5fc093c5b625e4259203f1cee7ca73488a5620 (diff) | |
| download | kernel_samsung_espresso10-89a55897a2fbbceb94480952784004bf23911d38.zip kernel_samsung_espresso10-89a55897a2fbbceb94480952784004bf23911d38.tar.gz kernel_samsung_espresso10-89a55897a2fbbceb94480952784004bf23911d38.tar.bz2 | |
Btrfs: fix df regression
The new ENOSPC stuff breaks out the raid types which breaks the way we were
reporting df to the system. This fixes it back so that Available is the total
space available to data and used is the actual bytes used by the filesystem.
This means that Available is Total - data used - all of the metadata space.
Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index f2393b3..afab6ca 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -716,18 +716,25 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf) struct list_head *head = &root->fs_info->space_info; struct btrfs_space_info *found; u64 total_used = 0; + u64 total_used_data = 0; int bits = dentry->d_sb->s_blocksize_bits; __be32 *fsid = (__be32 *)root->fs_info->fsid; rcu_read_lock(); - list_for_each_entry_rcu(found, head, list) + list_for_each_entry_rcu(found, head, list) { + if (found->flags & (BTRFS_BLOCK_GROUP_METADATA | + BTRFS_BLOCK_GROUP_SYSTEM)) + total_used_data += found->disk_total; + else + total_used_data += found->disk_used; total_used += found->disk_used; + } rcu_read_unlock(); buf->f_namelen = BTRFS_NAME_LEN; buf->f_blocks = btrfs_super_total_bytes(disk_super) >> bits; buf->f_bfree = buf->f_blocks - (total_used >> bits); - buf->f_bavail = buf->f_bfree; + buf->f_bavail = buf->f_blocks - (total_used_data >> bits); buf->f_bsize = dentry->d_sb->s_blocksize; buf->f_type = BTRFS_SUPER_MAGIC; |