提交 6e71c47a 编写于 作者: G Geert Uytterhoeven 提交者: Chris Mason

Btrfs: Make BTRFS_DEV_REPLACE_DEVID an unsigned long long constant

The internal btrfs device id is a u64, hence make the constant
BTRFS_DEV_REPLACE_DEVID "unsigned long long" as well, so we no longer need
a cast to print it.
Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: NJosef Bacik <jbacik@fusionio.com>
Signed-off-by: NChris Mason <chris.mason@fusionio.com>
上级 c1c9ff7c
...@@ -146,7 +146,7 @@ struct btrfs_ordered_sum; ...@@ -146,7 +146,7 @@ struct btrfs_ordered_sum;
#define BTRFS_EMPTY_SUBVOL_DIR_OBJECTID 2 #define BTRFS_EMPTY_SUBVOL_DIR_OBJECTID 2
#define BTRFS_DEV_REPLACE_DEVID 0 #define BTRFS_DEV_REPLACE_DEVID 0ULL
/* /*
* the max metadata block size. This limit is somewhat artificial, * the max metadata block size. This limit is somewhat artificial,
......
...@@ -154,7 +154,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) ...@@ -154,7 +154,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
!btrfs_test_opt(dev_root, DEGRADED)) { !btrfs_test_opt(dev_root, DEGRADED)) {
ret = -EIO; ret = -EIO;
pr_warn("btrfs: cannot mount because device replace operation is ongoing and\n" "tgtdev (devid %llu) is missing, need to run btrfs dev scan?\n", pr_warn("btrfs: cannot mount because device replace operation is ongoing and\n" "tgtdev (devid %llu) is missing, need to run btrfs dev scan?\n",
(unsigned long long)BTRFS_DEV_REPLACE_DEVID); BTRFS_DEV_REPLACE_DEVID);
} }
if (dev_replace->tgtdev) { if (dev_replace->tgtdev) {
if (dev_replace->srcdev) { if (dev_replace->srcdev) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册