From: Qu Wenruo Date: Tue, 12 Dec 2017 07:34:28 +0000 (+0800) Subject: btrfs: qgroup: Cleanup the remaining old reservation counters X-Git-Tag: 4.17-rc1SMB3-Fixes~98^2~22 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=5c40507ffb1bbbc8eeeaa6d8da181f431cb83d97 btrfs: qgroup: Cleanup the remaining old reservation counters So qgroup is switched to new separate types reservation system. Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 8ec103deb361..c0deebfecd93 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1070,19 +1070,6 @@ static void qgroup_dirty(struct btrfs_fs_info *fs_info, list_add(&qgroup->dirty, &fs_info->dirty_qgroups); } -static void report_reserved_underflow(struct btrfs_fs_info *fs_info, - struct btrfs_qgroup *qgroup, - u64 num_bytes) -{ -#ifdef CONFIG_BTRFS_DEBUG - WARN_ON(qgroup->reserved < num_bytes); - btrfs_debug(fs_info, - "qgroup %llu reserved space underflow, have: %llu, to free: %llu", - qgroup->qgroupid, qgroup->reserved, num_bytes); -#endif - qgroup->reserved = 0; -} - /* * The easy accounting, we're updating qgroup relationship whose child qgroup * only has exclusive extents. diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h index b5ee229b3ef1..279e71a21695 100644 --- a/fs/btrfs/qgroup.h +++ b/fs/btrfs/qgroup.h @@ -107,7 +107,6 @@ struct btrfs_qgroup { /* * reservation tracking */ - u64 reserved; struct btrfs_qgroup_rsv rsv; /*