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

The qgroup level is limited to u16, so no need to use u64 for it.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 787128d7e1962754bd498ae63fcd4c9a5b27cfc3..229e461dbfc322f912d918cab12acc029216d141 100644 (file)
--- 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
index a3f3975df0de41879a26c3360e58597429be9ab9..9ba64ca6b4ac953310d014ef9d4e3e6719f258b0 100644 (file)
--- 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);
 }
 
 /*