io-wq: use BIT for ulong hash
authorPavel Begunkov <asml.silence@gmail.com>
Fri, 28 Feb 2020 07:36:39 +0000 (10:36 +0300)
committerJens Axboe <axboe@kernel.dk>
Mon, 2 Mar 2020 21:06:31 +0000 (14:06 -0700)
@hash_map is unsigned long, but BIT_ULL() is used for manipulations.
BIT() is a better match as it returns exactly unsigned long value.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io-wq.c

index a1a42ead3b5a663c8916349850ad682f4d2ed7e7..042c7e2057eff5970477d3184de14e60a31babd0 100644 (file)
@@ -393,8 +393,8 @@ static struct io_wq_work *io_get_next_work(struct io_wqe *wqe, unsigned *hash)
 
                /* hashed, can run if not already running */
                *hash = work->flags >> IO_WQ_HASH_SHIFT;
-               if (!(wqe->hash_map & BIT_ULL(*hash))) {
-                       wqe->hash_map |= BIT_ULL(*hash);
+               if (!(wqe->hash_map & BIT(*hash))) {
+                       wqe->hash_map |= BIT(*hash);
                        wq_node_del(&wqe->work_list, node, prev);
                        return work;
                }
@@ -512,7 +512,7 @@ next:
                spin_lock_irq(&wqe->lock);
 
                if (hash != -1U) {
-                       wqe->hash_map &= ~BIT_ULL(hash);
+                       wqe->hash_map &= ~BIT(hash);
                        wqe->flags &= ~IO_WQE_FLAG_STALLED;
                }
                if (work && work != old_work) {