btrfs: use __u16 for the return value of btrfs_qgroup_level()

adam900710 · kdave · commit 06f67c47076e · 2020-07-27T12:55:37.000+02:00
The qgroup level is limited to u16, so no need to use u64 for it.

Signed-off-by: Qu Wenruo &lt;wqu@suse.com&gt;
Reviewed-by: David Sterba &lt;dsterba@suse.com&gt;
Signed-off-by: David Sterba &lt;dsterba@suse.com&gt;
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
@@ -538,7 +538,7 @@ bool btrfs_check_quota_leak(struct btrfs_fs_info *fs_info)
 			if (qgroup->rsv.values[i]) {
 				ret = true;
 				btrfs_warn(fs_info,
-		"qgroup %llu/%llu has unreleased space, type %d rsv %llu",
+		"qgroup %hu/%llu has unreleased space, type %d rsv %llu",
 				   btrfs_qgroup_level(qgroup->qgroupid),
 				   btrfs_qgroup_subvolid(qgroup->qgroupid),
 				   i, qgroup->rsv.values[i]);
diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h
@@ -913,9 +913,9 @@ struct btrfs_free_space_info {
 #define BTRFS_FREE_SPACE_USING_BITMAPS (1ULL << 0)
 
 #define BTRFS_QGROUP_LEVEL_SHIFT		48
-static inline __u64 btrfs_qgroup_level(__u64 qgroupid)
+static inline __u16 btrfs_qgroup_level(__u64 qgroupid)
 {
-	return qgroupid >> BTRFS_QGROUP_LEVEL_SHIFT;
+	return (__u16)(qgroupid >> BTRFS_QGROUP_LEVEL_SHIFT);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -913,9 +913,9 @@ struct btrfs_free_space_info {`
`913`	`913`	`#define BTRFS_FREE_SPACE_USING_BITMAPS (1ULL << 0)`
`914`	`914`
`915`	`915`	`#define BTRFS_QGROUP_LEVEL_SHIFT 48`
`916`		`-static inline __u64 btrfs_qgroup_level(__u64 qgroupid)`
	`916`	`+static inline __u16 btrfs_qgroup_level(__u64 qgroupid)`
`917`	`917`	`{`
`918`		`- return qgroupid >> BTRFS_QGROUP_LEVEL_SHIFT;`
	`918`	`+ return (__u16)(qgroupid >> BTRFS_QGROUP_LEVEL_SHIFT);`
`919`	`919`	`}`
`920`	`920`
`921`	`921`	`/*`