Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e71c47a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Chris Mason
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent c1c9ff7c

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ struct btrfs_ordered_sum; 


#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,

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) 
		    !btrfs_test_opt(dev_root, DEGRADED)) {

			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",

				(unsigned long long)BTRFS_DEV_REPLACE_DEVID);

				BTRFS_DEV_REPLACE_DEVID);

		}

		if (dev_replace->tgtdev) {

			if (dev_replace->srcdev) {