fuse: use private naming for fuse hash size

With a mix of include dependencies, the compiler warns that:

fs/fuse/dir.c:35:9: warning: ?HASH_BITS? redefined
   35 | #define HASH_BITS       5
      |         ^~~~~~~~~
In file included from ./include/linux/io_uring_types.h:5,
                 from ./include/linux/bpf.h:34,
                 from ./include/linux/security.h:35,
                 from ./include/linux/fs_context.h:14,
                 from fs/fuse/dir.c:13:
./include/linux/hashtable.h:28:9: note: this is the location of the previous definition
   28 | #define HASH_BITS(name) ilog2(HASH_SIZE(name))
      |         ^~~~~~~~~
fs/fuse/dir.c:36:9: warning: ?HASH_SIZE? redefined
   36 | #define HASH_SIZE       (1 << HASH_BITS)
      |         ^~~~~~~~~
./include/linux/hashtable.h:27:9: note: this is the location of the previous definition
   27 | #define HASH_SIZE(name) (ARRAY_SIZE(name))
      |         ^~~~~~~~~

Hence rename the HASH_SIZE/HASH_BITS in fuse, by prefixing them with
FUSE_ instead.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Link: https://patch.msgid.link/195c9525-281c-4302-9549-f3d9259416c6@kernel.dk
Acked-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 64b29db52cf47c5ce96509c7b1d715805e3c7566..dbb55bad5476ef2f33922305c78580b9e2ff92a4 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -32,9 +32,9 @@ struct dentry_bucket {
        spinlock_t lock;
 };
 
-#define HASH_BITS      5
-#define HASH_SIZE      (1 << HASH_BITS)
-static struct dentry_bucket dentry_hash[HASH_SIZE];
+#define FUSE_HASH_BITS 5
+#define FUSE_HASH_SIZE (1 << FUSE_HASH_BITS)
+static struct dentry_bucket dentry_hash[FUSE_HASH_SIZE];
 struct delayed_work dentry_tree_work;
 
 /* Minimum invalidation work queue frequency */
@@ -83,7 +83,7 @@ MODULE_PARM_DESC(inval_wq,
 
 static inline struct dentry_bucket *get_dentry_bucket(struct dentry *dentry)
 {
-       int i = hash_ptr(dentry, HASH_BITS);
+       int i = hash_ptr(dentry, FUSE_HASH_BITS);
 
        return &dentry_hash[i];
 }
@@ -164,7 +164,7 @@ static void fuse_dentry_tree_work(struct work_struct *work)
        struct rb_node *node;
        int i;
 
-       for (i = 0; i < HASH_SIZE; i++) {
+       for (i = 0; i < FUSE_HASH_SIZE; i++) {
                spin_lock(&dentry_hash[i].lock);
                node = rb_first(&dentry_hash[i].tree);
                while (node) {
@@ -213,7 +213,7 @@ void fuse_dentry_tree_init(void)
 {
        int i;
 
-       for (i = 0; i < HASH_SIZE; i++) {
+       for (i = 0; i < FUSE_HASH_SIZE; i++) {
                spin_lock_init(&dentry_hash[i].lock);
                dentry_hash[i].tree = RB_ROOT;
        }
@@ -227,7 +227,7 @@ void fuse_dentry_tree_cleanup(void)
        inval_wq = 0;
        cancel_delayed_work_sync(&dentry_tree_work);
 
-       for (i = 0; i < HASH_SIZE; i++)
+       for (i = 0; i < FUSE_HASH_SIZE; i++)
                WARN_ON_ONCE(!RB_EMPTY_ROOT(&dentry_hash[i].tree));
 }