Skip to content

Commit ce0dcee

Browse files
goldwynrkdave
authored andcommitted
btrfs: Change qgroup_meta_rsv to 64bit
Using an int value is causing qg->reserved to become negative and exclusive -EDQUOT to be reached prematurely. This affects exclusive qgroups only. TEST CASE: DEVICE=/dev/vdb MOUNTPOINT=/mnt SUBVOL=$MOUNTPOINT/tmp umount $SUBVOL umount $MOUNTPOINT mkfs.btrfs -f $DEVICE mount /dev/vdb $MOUNTPOINT btrfs quota enable $MOUNTPOINT btrfs subvol create $SUBVOL umount $MOUNTPOINT mount /dev/vdb $MOUNTPOINT mount -o subvol=tmp $DEVICE $SUBVOL btrfs qgroup limit -e 3G $SUBVOL btrfs quota rescan /mnt -w for i in `seq 1 44000`; do dd if=/dev/zero of=/mnt/tmp/test_$i bs=10k count=1 if [[ $? > 0 ]]; then btrfs qgroup show -pcref $SUBVOL exit 1 fi done Signed-off-by: Goldwyn Rodrigues <[email protected]> [ add reproducer to changelog ] Signed-off-by: David Sterba <[email protected]>
1 parent 9d0d1c8 commit ce0dcee

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

fs/btrfs/ctree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ struct btrfs_root {
12581258
atomic_t will_be_snapshoted;
12591259

12601260
/* For qgroup metadata space reserve */
1261-
atomic_t qgroup_meta_rsv;
1261+
atomic64_t qgroup_meta_rsv;
12621262
};
12631263
static inline u32 btrfs_inode_sectorsize(const struct inode *inode)
12641264
{

fs/btrfs/disk-io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,
13421342
atomic_set(&root->orphan_inodes, 0);
13431343
atomic_set(&root->refs, 1);
13441344
atomic_set(&root->will_be_snapshoted, 0);
1345-
atomic_set(&root->qgroup_meta_rsv, 0);
1345+
atomic64_set(&root->qgroup_meta_rsv, 0);
13461346
root->log_transid = 0;
13471347
root->log_transid_committed = -1;
13481348
root->last_log_commit = 0;

fs/btrfs/qgroup.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2948,20 +2948,20 @@ int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
29482948
ret = qgroup_reserve(root, num_bytes, enforce);
29492949
if (ret < 0)
29502950
return ret;
2951-
atomic_add(num_bytes, &root->qgroup_meta_rsv);
2951+
atomic64_add(num_bytes, &root->qgroup_meta_rsv);
29522952
return ret;
29532953
}
29542954

29552955
void btrfs_qgroup_free_meta_all(struct btrfs_root *root)
29562956
{
29572957
struct btrfs_fs_info *fs_info = root->fs_info;
2958-
int reserved;
2958+
u64 reserved;
29592959

29602960
if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) ||
29612961
!is_fstree(root->objectid))
29622962
return;
29632963

2964-
reserved = atomic_xchg(&root->qgroup_meta_rsv, 0);
2964+
reserved = atomic64_xchg(&root->qgroup_meta_rsv, 0);
29652965
if (reserved == 0)
29662966
return;
29672967
btrfs_qgroup_free_refroot(fs_info, root->objectid, reserved);
@@ -2976,8 +2976,8 @@ void btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes)
29762976
return;
29772977

29782978
BUG_ON(num_bytes != round_down(num_bytes, fs_info->nodesize));
2979-
WARN_ON(atomic_read(&root->qgroup_meta_rsv) < num_bytes);
2980-
atomic_sub(num_bytes, &root->qgroup_meta_rsv);
2979+
WARN_ON(atomic64_read(&root->qgroup_meta_rsv) < num_bytes);
2980+
atomic64_sub(num_bytes, &root->qgroup_meta_rsv);
29812981
btrfs_qgroup_free_refroot(fs_info, root->objectid, num_bytes);
29822982
}
29832983

0 commit comments

Comments
 (0)