btrfs-progs: build btrfs.static needs libbtrfsutil to build

[platform/upstream/btrfs-progs.git] / mkfs / common.c

diff --git a/mkfs/common.c b/mkfs/common.c
index 8e85942..a6d3e66 100644 (file)
--- a/mkfs/common.c
+++ b/mkfs/common.c
@@ -44,6 +44,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
        u32 itemoff;
        int ret = 0;
        int blk;
+       u8 uuid[BTRFS_UUID_SIZE];
 
        memset(buf->data + sizeof(struct btrfs_header), 0,
                cfg->nodesize - sizeof(struct btrfs_header));
@@ -77,6 +78,19 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
                btrfs_set_item_offset(buf, btrfs_item_nr(nritems), itemoff);
                btrfs_set_item_size(buf, btrfs_item_nr(nritems),
                                sizeof(root_item));
+               if (blk == MKFS_FS_TREE) {
+                       time_t now = time(NULL);
+
+                       uuid_generate(uuid);
+                       memcpy(root_item.uuid, uuid, BTRFS_UUID_SIZE);
+                       btrfs_set_stack_timespec_sec(&root_item.otime, now);
+                       btrfs_set_stack_timespec_sec(&root_item.ctime, now);
+               } else {
+                       memset(uuid, 0, BTRFS_UUID_SIZE);
+                       memcpy(root_item.uuid, uuid, BTRFS_UUID_SIZE);
+                       btrfs_set_stack_timespec_sec(&root_item.otime, 0);
+                       btrfs_set_stack_timespec_sec(&root_item.ctime, 0);
+               }
                write_extent_buffer(buf, &root_item,
                        btrfs_item_ptr_offset(buf, nritems),
                        sizeof(root_item));
@@ -85,7 +99,7 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
        }
 
        /* generate checksum */
-       csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
+       csum_tree_block_size(buf, btrfs_csum_sizes[BTRFS_CSUM_TYPE_CRC32], 0);
 
        /* write back root tree */
        ret = pwrite(fd, buf->data, cfg->nodesize, cfg->blocks[MKFS_ROOT_TREE]);
@@ -276,7 +290,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
        btrfs_set_header_bytenr(buf, cfg->blocks[MKFS_EXTENT_TREE]);
        btrfs_set_header_owner(buf, BTRFS_EXTENT_TREE_OBJECTID);
        btrfs_set_header_nritems(buf, nritems);
-       csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
+       csum_tree_block_size(buf, btrfs_csum_sizes[BTRFS_CSUM_TYPE_CRC32], 0);
        ret = pwrite(fd, buf->data, cfg->nodesize, cfg->blocks[MKFS_EXTENT_TREE]);
        if (ret != cfg->nodesize) {
                ret = (ret < 0 ? -errno : -EIO);
@@ -364,7 +378,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
        btrfs_set_header_bytenr(buf, cfg->blocks[MKFS_CHUNK_TREE]);
        btrfs_set_header_owner(buf, BTRFS_CHUNK_TREE_OBJECTID);
        btrfs_set_header_nritems(buf, nritems);
-       csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
+       csum_tree_block_size(buf, btrfs_csum_sizes[BTRFS_CSUM_TYPE_CRC32], 0);
        ret = pwrite(fd, buf->data, cfg->nodesize, cfg->blocks[MKFS_CHUNK_TREE]);
        if (ret != cfg->nodesize) {
                ret = (ret < 0 ? -errno : -EIO);
@@ -404,7 +418,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
        btrfs_set_header_bytenr(buf, cfg->blocks[MKFS_DEV_TREE]);
        btrfs_set_header_owner(buf, BTRFS_DEV_TREE_OBJECTID);
        btrfs_set_header_nritems(buf, nritems);
-       csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
+       csum_tree_block_size(buf, btrfs_csum_sizes[BTRFS_CSUM_TYPE_CRC32], 0);
        ret = pwrite(fd, buf->data, cfg->nodesize, cfg->blocks[MKFS_DEV_TREE]);
        if (ret != cfg->nodesize) {
                ret = (ret < 0 ? -errno : -EIO);
@@ -417,7 +431,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
        btrfs_set_header_bytenr(buf, cfg->blocks[MKFS_FS_TREE]);
        btrfs_set_header_owner(buf, BTRFS_FS_TREE_OBJECTID);
        btrfs_set_header_nritems(buf, 0);
-       csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
+       csum_tree_block_size(buf, btrfs_csum_sizes[BTRFS_CSUM_TYPE_CRC32], 0);
        ret = pwrite(fd, buf->data, cfg->nodesize, cfg->blocks[MKFS_FS_TREE]);
        if (ret != cfg->nodesize) {
                ret = (ret < 0 ? -errno : -EIO);
@@ -429,7 +443,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
        btrfs_set_header_bytenr(buf, cfg->blocks[MKFS_CSUM_TREE]);
        btrfs_set_header_owner(buf, BTRFS_CSUM_TREE_OBJECTID);
        btrfs_set_header_nritems(buf, 0);
-       csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
+       csum_tree_block_size(buf, btrfs_csum_sizes[BTRFS_CSUM_TYPE_CRC32], 0);
        ret = pwrite(fd, buf->data, cfg->nodesize, cfg->blocks[MKFS_CSUM_TREE]);
        if (ret != cfg->nodesize) {
                ret = (ret < 0 ? -errno : -EIO);
@@ -440,7 +454,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
        memset(buf->data, 0, BTRFS_SUPER_INFO_SIZE);
        memcpy(buf->data, &super, sizeof(super));
        buf->len = BTRFS_SUPER_INFO_SIZE;
-       csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
+       csum_tree_block_size(buf, btrfs_csum_sizes[BTRFS_CSUM_TYPE_CRC32], 0);
        ret = pwrite(fd, buf->data, BTRFS_SUPER_INFO_SIZE,
                        cfg->blocks[MKFS_SUPER_BLOCK]);
        if (ret != BTRFS_SUPER_INFO_SIZE) {
@@ -713,11 +727,11 @@ int test_dev_for_mkfs(const char *file, int force_overwrite)
        /* check if the device is busy */
        fd = open(file, O_RDWR|O_EXCL);
        if (fd < 0) {
-               error("unable to open %s: %s", file, strerror(errno));
+               error("unable to open %s: %m", file);
                return 1;
        }
        if (fstat(fd, &st)) {
-               error("unable to stat %s: %s", file, strerror(errno));
+               error("unable to stat %s: %m", file);
                close(fd);
                return 1;
        }