btrfs: qgroup: Skeleton to support separate qgroup reservation type (d4e5c920) · Commits · 戴 / test

fs/btrfs/qgroup.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -2434,7 +2434,8 @@ out:
		}

		void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
		u64 ref_root, u64 num_bytes)
		u64 ref_root, u64 num_bytes,
		enum btrfs_qgroup_rsv_type type)
		{
		struct btrfs_root *quota_root;
		struct btrfs_qgroup *qgroup;
		@@ -2925,7 +2926,8 @@ static int qgroup_free_reserved_data(struct inode *inode,
		goto out;
		freed += changeset.bytes_changed;
		}
		btrfs_qgroup_free_refroot(root->fs_info, root->objectid, freed);
		btrfs_qgroup_free_refroot(root->fs_info, root->objectid, freed,
		BTRFS_QGROUP_RSV_DATA);
		ret = freed;
		out:
		extent_changeset_release(&changeset);
		@@ -2957,7 +2959,7 @@ static int __btrfs_qgroup_release_data(struct inode *inode,
		if (free)
		btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
		BTRFS_I(inode)->root->objectid,
		changeset.bytes_changed);
		changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);
		ret = changeset.bytes_changed;
		out:
		extent_changeset_release(&changeset);
		@@ -3034,7 +3036,8 @@ void btrfs_qgroup_free_meta_all(struct btrfs_root *root)
		if (reserved == 0)
		return;
		trace_qgroup_meta_reserve(root, -(s64)reserved);
		btrfs_qgroup_free_refroot(fs_info, root->objectid, reserved);
		btrfs_qgroup_free_refroot(fs_info, root->objectid, reserved,
		BTRFS_QGROUP_RSV_META);
		}

		void btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes)
		@@ -3049,7 +3052,8 @@ void btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes)
		WARN_ON(atomic64_read(&root->qgroup_meta_rsv) < num_bytes);
		atomic64_sub(num_bytes, &root->qgroup_meta_rsv);
		trace_qgroup_meta_reserve(root, -(s64)num_bytes);
		btrfs_qgroup_free_refroot(fs_info, root->objectid, num_bytes);
		btrfs_qgroup_free_refroot(fs_info, root->objectid, num_bytes,
		BTRFS_QGROUP_RSV_META);
		}

		/*
		@@ -3077,7 +3081,7 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode)
		}
		btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
		BTRFS_I(inode)->root->objectid,
		changeset.bytes_changed);
		changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);

		}
		extent_changeset_release(&changeset);

fs/btrfs/qgroup.h

+25 −2

Original line number	Diff line number	Diff line
		@@ -61,6 +61,26 @@ struct btrfs_qgroup_extent_record {
		struct ulist *old_roots;
		};

		enum btrfs_qgroup_rsv_type {
		BTRFS_QGROUP_RSV_DATA = 0,
		BTRFS_QGROUP_RSV_META,
		BTRFS_QGROUP_RSV_LAST,
		};

		/*
		* Represents how many bytes we have reserved for this qgroup.
		*
		* Each type should have different reservation behavior.
		* E.g, data follows its io_tree flag modification, while
		* currently meta is just reserve-and-clear during transcation.
		*
		* TODO: Add new type for reservation which can survive transaction commit.
		* Currect metadata reservation behavior is not suitable for such case.
		*/
		struct btrfs_qgroup_rsv {
		u64 values[BTRFS_QGROUP_RSV_LAST];
		};

		/*
		* one struct for each qgroup, organized in fs_info->qgroup_tree.
		*/
		@@ -88,6 +108,7 @@ struct btrfs_qgroup {
		* reservation tracking
		*/
		u64 reserved;
		struct btrfs_qgroup_rsv rsv;

		/*
		* lists
		@@ -227,12 +248,14 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
		struct btrfs_fs_info *fs_info, u64 srcid, u64 objectid,
		struct btrfs_qgroup_inherit *inherit);
		void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
		u64 ref_root, u64 num_bytes);
		u64 ref_root, u64 num_bytes,
		enum btrfs_qgroup_rsv_type type);
		static inline void btrfs_qgroup_free_delayed_ref(struct btrfs_fs_info *fs_info,
		u64 ref_root, u64 num_bytes)
		{
		trace_btrfs_qgroup_free_delayed_ref(fs_info, ref_root, num_bytes);
		btrfs_qgroup_free_refroot(fs_info, ref_root, num_bytes);
		btrfs_qgroup_free_refroot(fs_info, ref_root, num_bytes,
		BTRFS_QGROUP_RSV_DATA);
		}

		#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

Admin message