btrfs: turn name_cache radix tree into XArray in send_ctx

… and adjust all usages of this object to use the XArray API for the sake
of consistency.

XArray API provides array semantics, so it is notionally easier to use and
understand, and it also takes care of locking for us.

None of this makes a real difference in this particular patch, but it does
in other places where similar replacements are or have been made and we
want to be consistent in our usage of data structures in btrfs.

Signed-off-by: Gabriel Niebler <gniebler@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index cf86f1eafcb7085a0314263043b9608d46590aa8..330bef72a5552a04601666e1e3993f8500dc1550 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -10,7 +10,6 @@
 #include <linux/mount.h>
 #include <linux/xattr.h>
 #include <linux/posix_acl_xattr.h>
-#include <linux/radix-tree.h>
 #include <linux/vmalloc.h>
 #include <linux/string.h>
 #include <linux/compat.h>
@@ -128,7 +127,7 @@ struct send_ctx {
        struct list_head new_refs;
        struct list_head deleted_refs;
 
-       struct radix_tree_root name_cache;
+       struct xarray name_cache;
        struct list_head name_cache_list;
        int name_cache_size;
 
@@ -262,14 +261,13 @@ struct orphan_dir_info {
 struct name_cache_entry {
        struct list_head list;
        /*
-        * radix_tree has only 32bit entries but we need to handle 64bit inums.
-        * We use the lower 32bit of the 64bit inum to store it in the tree. If
-        * more then one inum would fall into the same entry, we use radix_list
-        * to store the additional entries. radix_list is also used to store
-        * entries where two entries have the same inum but different
-        * generations.
+        * On 32bit kernels, xarray has only 32bit indices, but we need to
+        * handle 64bit inums. We use the lower 32bit of the 64bit inum to store
+        * it in the tree. If more than one inum would fall into the same entry,
+        * we use inum_aliases to store the additional entries. inum_aliases is
+        * also used to store entries with the same inum but different generations.
         */
-       struct list_head radix_list;
+       struct list_head inum_aliases;
        u64 ino;
        u64 gen;
        u64 parent_ino;
@@ -2019,9 +2017,9 @@ out:
 }
 
 /*
- * Insert a name cache entry. On 32bit kernels the radix tree index is 32bit,
+ * Insert a name cache entry. On 32bit kernels the xarray index is 32bit,
  * so we need to do some special handling in case we have clashes. This function
- * takes care of this with the help of name_cache_entry::radix_list.
+ * takes care of this with the help of name_cache_entry::inum_aliases.
  * In case of error, nce is kfreed.
  */
 static int name_cache_insert(struct send_ctx *sctx,
@@ -2030,8 +2028,7 @@ static int name_cache_insert(struct send_ctx *sctx,
        int ret = 0;
        struct list_head *nce_head;
 
-       nce_head = radix_tree_lookup(&sctx->name_cache,
-                       (unsigned long)nce->ino);
+       nce_head = xa_load(&sctx->name_cache, (unsigned long)nce->ino);
        if (!nce_head) {
                nce_head = kmalloc(sizeof(*nce_head), GFP_KERNEL);
                if (!nce_head) {
@@ -2040,14 +2037,14 @@ static int name_cache_insert(struct send_ctx *sctx,
                }
                INIT_LIST_HEAD(nce_head);
 
-               ret = radix_tree_insert(&sctx->name_cache, nce->ino, nce_head);
+               ret = xa_insert(&sctx->name_cache, nce->ino, nce_head, GFP_KERNEL);
                if (ret < 0) {
                        kfree(nce_head);
                        kfree(nce);
                        return ret;
                }
        }
-       list_add_tail(&nce->radix_list, nce_head);
+       list_add_tail(&nce->inum_aliases, nce_head);
        list_add_tail(&nce->list, &sctx->name_cache_list);
        sctx->name_cache_size++;
 
@@ -2059,15 +2056,14 @@ static void name_cache_delete(struct send_ctx *sctx,
 {
        struct list_head *nce_head;
 
-       nce_head = radix_tree_lookup(&sctx->name_cache,
-                       (unsigned long)nce->ino);
+       nce_head = xa_load(&sctx->name_cache, (unsigned long)nce->ino);
        if (!nce_head) {
                btrfs_err(sctx->send_root->fs_info,
              "name_cache_delete lookup failed ino %llu cache size %d, leaking memory",
                        nce->ino, sctx->name_cache_size);
        }
 
-       list_del(&nce->radix_list);
+       list_del(&nce->inum_aliases);
        list_del(&nce->list);
        sctx->name_cache_size--;
 
@@ -2075,7 +2071,7 @@ static void name_cache_delete(struct send_ctx *sctx,
         * We may not get to the final release of nce_head if the lookup fails
         */
        if (nce_head && list_empty(nce_head)) {
-               radix_tree_delete(&sctx->name_cache, (unsigned long)nce->ino);
+               xa_erase(&sctx->name_cache, (unsigned long)nce->ino);
                kfree(nce_head);
        }
 }
@@ -2086,11 +2082,11 @@ static struct name_cache_entry *name_cache_search(struct send_ctx *sctx,
        struct list_head *nce_head;
        struct name_cache_entry *cur;
 
-       nce_head = radix_tree_lookup(&sctx->name_cache, (unsigned long)ino);
+       nce_head = xa_load(&sctx->name_cache, (unsigned long)ino);
        if (!nce_head)
                return NULL;
 
-       list_for_each_entry(cur, nce_head, radix_list) {
+       list_for_each_entry(cur, nce_head, inum_aliases) {
                if (cur->ino == ino && cur->gen == gen)
                        return cur;
        }
@@ -7429,7 +7425,7 @@ long btrfs_ioctl_send(struct inode *inode, struct btrfs_ioctl_send_args *arg)
 
        INIT_LIST_HEAD(&sctx->new_refs);
        INIT_LIST_HEAD(&sctx->deleted_refs);
-       INIT_RADIX_TREE(&sctx->name_cache, GFP_KERNEL);
+       xa_init_flags(&sctx->name_cache, GFP_KERNEL);
        INIT_LIST_HEAD(&sctx->name_cache_list);
 
        sctx->flags = arg->flags;