btrfs: switch to use new generic UUID API

There are new types and helpers that are supposed to be used in new code.

As a preparation to get rid of legacy types and API functions do
the conversion here.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index a4493e5dac2263326f02ed1caa68a1500c11365d..f01f19c76cf59452c4b29f564ef9250e158e2356 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1223,7 +1223,6 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
        struct btrfs_key key;
        unsigned int nofs_flag;
        int ret = 0;
-       uuid_le uuid = NULL_UUID_LE;
 
        /*
         * We're holding a transaction handle, so use a NOFS memory allocation
@@ -1262,8 +1261,9 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
        btrfs_set_root_last_snapshot(&root->root_item, 0);
        btrfs_set_root_dirid(&root->root_item, 0);
        if (is_fstree(objectid))
-               uuid_le_gen(&uuid);
-       memcpy(root->root_item.uuid, uuid.b, BTRFS_UUID_SIZE);
+               generate_random_guid(root->root_item.uuid);
+       else
+               export_guid(root->root_item.uuid, &guid_null);
        root->root_item.drop_level = 0;
 
        key.objectid = objectid;

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 0bedb5da061ded27368e8f19d62469517a7c7c57..04899d3d775e69da7112545c81379140857d715e 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -574,7 +574,6 @@ static noinline int create_subvol(struct inode *dir,
        u64 objectid;
        u64 new_dirid = BTRFS_FIRST_FREE_OBJECTID;
        u64 index = 0;
-       uuid_le new_uuid;
 
        root_item = kzalloc(sizeof(*root_item), GFP_KERNEL);
        if (!root_item)
@@ -644,8 +643,7 @@ static noinline int create_subvol(struct inode *dir,
 
        btrfs_set_root_generation_v2(root_item,
                        btrfs_root_generation(root_item));
-       uuid_le_gen(&new_uuid);
-       memcpy(root_item->uuid, new_uuid.b, BTRFS_UUID_SIZE);
+       generate_random_guid(root_item->uuid);
        btrfs_set_stack_timespec_sec(&root_item->otime, cur_time.tv_sec);
        btrfs_set_stack_timespec_nsec(&root_item->otime, cur_time.tv_nsec);
        root_item->ctime = root_item->otime;

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index b37904327c9e885537ddbbe0cb8347dff293f8cd..98b6e0d980f9a16725b82073d752ebd3ce01667a 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -22,7 +22,6 @@
 static void btrfs_read_root_item(struct extent_buffer *eb, int slot,
                                struct btrfs_root_item *item)
 {
-       uuid_le uuid;
        u32 len;
        int need_reset = 0;
 
@@ -44,8 +43,7 @@ static void btrfs_read_root_item(struct extent_buffer *eb, int slot,
                        sizeof(*item) - offsetof(struct btrfs_root_item,
                                        generation_v2));
 
-               uuid_le_gen(&uuid);
-               memcpy(item->uuid, uuid.b, BTRFS_UUID_SIZE);
+               generate_random_guid(item->uuid);
        }
 }
 

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 702e0f2b8307de56d94a1220ffc66a566bbd9a0f..ca617441ecbb8cbf49b02be826b25294955b7c2a 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1479,7 +1479,6 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
        u64 index = 0;
        u64 objectid;
        u64 root_flags;
-       uuid_le new_uuid;
 
        ASSERT(pending->path);
        path = pending->path;
@@ -1572,8 +1571,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
 
        btrfs_set_root_generation_v2(new_root_item,
                        trans->transid);
-       uuid_le_gen(&new_uuid);
-       memcpy(new_root_item->uuid, new_uuid.b, BTRFS_UUID_SIZE);
+       generate_random_guid(new_root_item->uuid);
        memcpy(new_root_item->parent_uuid, root->root_item.uuid,
                        BTRFS_UUID_SIZE);
        if (!(root_flags & BTRFS_ROOT_SUBVOL_RDONLY)) {
@@ -1684,7 +1682,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
                btrfs_abort_transaction(trans, ret);
                goto fail;
        }
-       ret = btrfs_uuid_tree_add(trans, new_uuid.b, BTRFS_UUID_KEY_SUBVOL,
+       ret = btrfs_uuid_tree_add(trans, new_root_item->uuid,
+                                 BTRFS_UUID_KEY_SUBVOL,
                                  objectid);
        if (ret) {
                btrfs_abort_transaction(trans, ret);