summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2015-06-06 01:39:26 +0200
committerDavid Sterba <dsterba@suse.cz>2015-06-08 17:50:42 +0200
commit49ac5f50b5d466c92be25c83aa354c64c1f00ca3 (patch)
tree8db2fa63cf01607375b65810d167ad4af7297ebe
parent42a89831437ba96b42958cd8c5fdc670699d56c2 (diff)
btrfs-progs: mkfs: move info message out of btrfs_add_to_fsid
Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r--mkfs.c9
-rw-r--r--utils.c3
2 files changed, 9 insertions, 3 deletions
diff --git a/mkfs.c b/mkfs.c
index c0f60609..08257657 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1522,6 +1522,15 @@ int main(int ac, char **av)
ret = btrfs_add_to_fsid(trans, root, fd, file, dev_block_count,
sectorsize, sectorsize, sectorsize);
BUG_ON(ret);
+ if (verbose >= 2) {
+ struct btrfs_device *device;
+
+ device = container_of(root->fs_info->fs_devices->devices.next,
+ struct btrfs_device, dev_list);
+ printf("adding device %s id %llu\n", file,
+ (unsigned long long)device->devid);
+ }
+
btrfs_register_one_device(file);
}
diff --git a/utils.c b/utils.c
index 4554f0d1..61a9cd93 100644
--- a/utils.c
+++ b/utils.c
@@ -762,9 +762,6 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
memcpy(disk_super, super, sizeof(*disk_super));
- printf("adding device %s id %llu\n", path,
- (unsigned long long)device->devid);
-
btrfs_set_super_bytenr(disk_super, BTRFS_SUPER_INFO_OFFSET);
btrfs_set_stack_device_id(dev_item, device->devid);
btrfs_set_stack_device_type(dev_item, device->type);