diff options
-rw-r--r-- | fs/btrfs/ctree.h | 2 | ||||
-rw-r--r-- | fs/btrfs/dev-replace.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0ef9d866952f..7add85a645a3 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -146,7 +146,7 @@ struct btrfs_ordered_sum; | |||
146 | 146 | ||
147 | #define BTRFS_EMPTY_SUBVOL_DIR_OBJECTID 2 | 147 | #define BTRFS_EMPTY_SUBVOL_DIR_OBJECTID 2 |
148 | 148 | ||
149 | #define BTRFS_DEV_REPLACE_DEVID 0 | 149 | #define BTRFS_DEV_REPLACE_DEVID 0ULL |
150 | 150 | ||
151 | /* | 151 | /* |
152 | * the max metadata block size. This limit is somewhat artificial, | 152 | * the max metadata block size. This limit is somewhat artificial, |
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index e34e72f3e1aa..af800ef677a0 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
@@ -154,7 +154,7 @@ no_valid_dev_replace_entry_found: | |||
154 | !btrfs_test_opt(dev_root, DEGRADED)) { | 154 | !btrfs_test_opt(dev_root, DEGRADED)) { |
155 | ret = -EIO; | 155 | ret = -EIO; |
156 | 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", | 156 | 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", |
157 | (unsigned long long)BTRFS_DEV_REPLACE_DEVID); | 157 | BTRFS_DEV_REPLACE_DEVID); |
158 | } | 158 | } |
159 | if (dev_replace->tgtdev) { | 159 | if (dev_replace->tgtdev) { |
160 | if (dev_replace->srcdev) { | 160 | if (dev_replace->srcdev) { |