]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drbd: fix if(); found by kbuild test robot
authorLars Ellenberg <lars.ellenberg@linbit.com>
Wed, 27 Mar 2013 13:08:49 +0000 (14:08 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 28 Mar 2013 16:10:26 +0000 (10:10 -0600)
Recently introduced al_begin_io_nonblock() was returning -EBUSY,
even when it should return -EWOULDBLOCK.

Impact:
A few spurious wake_up() calls in prepare_al_transaction_nonblock().

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/drbd/drbd_actlog.c

index 6afe173d5c2bec0f5fabc8b3b5bdcad4dab5a46f..6608076dc39e73cda5f3aaf705579e3189421e3e 100644 (file)
@@ -389,7 +389,7 @@ int drbd_al_begin_io_nonblock(struct drbd_conf *mdev, struct drbd_interval *i)
                if (unlikely(tmp != NULL)) {
                        struct bm_extent  *bm_ext = lc_entry(tmp, struct bm_extent, lce);
                        if (test_bit(BME_NO_WRITES, &bm_ext->flags)) {
-                               if (!test_and_set_bit(BME_PRIORITY, &bm_ext->flags));
+                               if (!test_and_set_bit(BME_PRIORITY, &bm_ext->flags))
                                        return -EBUSY;
                                return -EWOULDBLOCK;
                        }