drbd: Remove the terrible DEV hack

DRBD was using dev_err() and similar all over the code; instead of having to
write dev_err(disk_to_dev(device->vdisk), ...) to convert a drbd_device into a
kernel device, a DEV macro was used which implicitly references the device
variable.  This is terrible; introduce separate drbd_err() and similar macros
with an explicit device parameter instead.

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c
index 4af4dc1..4d892b1 100644 (file)
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
@@ -137,7 +137,7 @@ void wait_until_done_or_force_detached(struct drbd_device *device, struct drbd_b
        dt = wait_event_timeout(device->misc_wait,
                        *done || test_bit(FORCE_DETACH, &device->flags), dt);
        if (dt == 0) {
-               dev_err(DEV, "meta-data IO operation timed out\n");
+               drbd_err(device, "meta-data IO operation timed out\n");
                drbd_chk_io_error(device, 1, DRBD_FORCE_DETACH);
        }
 }
@@ -172,7 +172,7 @@ static int _drbd_md_sync_page_io(struct drbd_device *device,
                ;
        else if (!get_ldev_if_state(device, D_ATTACHING)) {
                /* Corresponding put_ldev in drbd_md_io_complete() */
-               dev_err(DEV, "ASSERT FAILED: get_ldev_if_state() == 1 in _drbd_md_sync_page_io()\n");
+               drbd_err(device, "ASSERT FAILED: get_ldev_if_state() == 1 in _drbd_md_sync_page_io()\n");
                err = -ENODEV;
                goto out;
        }
@@ -202,21 +202,21 @@ int drbd_md_sync_page_io(struct drbd_device *device, struct drbd_backing_dev *bd
 
        BUG_ON(!bdev->md_bdev);
 
-       dev_dbg(DEV, "meta_data io: %s [%d]:%s(,%llus,%s) %pS\n",
+       drbd_dbg(device, "meta_data io: %s [%d]:%s(,%llus,%s) %pS\n",
             current->comm, current->pid, __func__,
             (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ",
             (void*)_RET_IP_ );
 
        if (sector < drbd_md_first_sector(bdev) ||
            sector + 7 > drbd_md_last_sector(bdev))
-               dev_alert(DEV, "%s [%d]:%s(,%llus,%s) out of range md access!\n",
+               drbd_alert(device, "%s [%d]:%s(,%llus,%s) out of range md access!\n",
                     current->comm, current->pid, __func__,
                     (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ");
 
        /* we do all our meta data IO in aligned 4k blocks. */
        err = _drbd_md_sync_page_io(device, bdev, iop, sector, rw, 4096);
        if (err) {
-               dev_err(DEV, "drbd_md_sync_page_io(,%llus,%s) failed with error %d\n",
+               drbd_err(device, "drbd_md_sync_page_io(,%llus,%s) failed with error %d\n",
                    (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ", err);
        }
        return err;
@@ -404,7 +404,7 @@ int drbd_al_begin_io_nonblock(struct drbd_device *device, struct drbd_interval *
                struct lc_element *al_ext;
                al_ext = lc_get_cumulative(device->act_log, enr);
                if (!al_ext)
-                       dev_info(DEV, "LOGIC BUG for enr=%u\n", enr);
+                       drbd_info(device, "LOGIC BUG for enr=%u\n", enr);
        }
        return 0;
 }
@@ -425,7 +425,7 @@ void drbd_al_complete_io(struct drbd_device *device, struct drbd_interval *i)
        for (enr = first; enr <= last; enr++) {
                extent = lc_find(device->act_log, enr);
                if (!extent) {
-                       dev_err(DEV, "al_complete_io() called on inactive extent %u\n", enr);
+                       drbd_err(device, "al_complete_io() called on inactive extent %u\n", enr);
                        continue;
                }
                lc_put(device->act_log, extent);
@@ -491,14 +491,14 @@ _al_write_transaction(struct drbd_device *device)
        int err = 0;
 
        if (!get_ldev(device)) {
-               dev_err(DEV, "disk is %s, cannot start al transaction\n",
+               drbd_err(device, "disk is %s, cannot start al transaction\n",
                        drbd_disk_str(device->state.disk));
                return -EIO;
        }
 
        /* The bitmap write may have failed, causing a state change. */
        if (device->state.disk < D_INCONSISTENT) {
-               dev_err(DEV,
+               drbd_err(device,
                        "disk is %s, cannot write al transaction\n",
                        drbd_disk_str(device->state.disk));
                put_ldev(device);
@@ -507,7 +507,7 @@ _al_write_transaction(struct drbd_device *device)
 
        buffer = drbd_md_get_buffer(device); /* protects md_io_buffer, al_tr_cycle, ... */
        if (!buffer) {
-               dev_err(DEV, "disk failed while waiting for md_io buffer\n");
+               drbd_err(device, "disk failed while waiting for md_io buffer\n");
                put_ldev(device);
                return -ENODEV;
        }
@@ -689,7 +689,7 @@ static int w_update_odbm(struct drbd_work *w, int unused)
 
        if (!get_ldev(device)) {
                if (__ratelimit(&drbd_ratelimit_state))
-                       dev_warn(DEV, "Can not update on disk bitmap, local IO disabled.\n");
+                       drbd_warn(device, "Can not update on disk bitmap, local IO disabled.\n");
                kfree(udw);
                return 0;
        }
@@ -744,7 +744,7 @@ static void drbd_try_clear_on_disk_bm(struct drbd_device *device, sector_t secto
                        else
                                ext->rs_failed += count;
                        if (ext->rs_left < ext->rs_failed) {
-                               dev_warn(DEV, "BAD! sector=%llus enr=%u rs_left=%d "
+                               drbd_warn(device, "BAD! sector=%llus enr=%u rs_left=%d "
                                    "rs_failed=%d count=%d cstate=%s\n",
                                     (unsigned long long)sector,
                                     ext->lce.lc_number, ext->rs_left,
@@ -768,14 +768,14 @@ static void drbd_try_clear_on_disk_bm(struct drbd_device *device, sector_t secto
                         */
                        int rs_left = drbd_bm_e_weight(device, enr);
                        if (ext->flags != 0) {
-                               dev_warn(DEV, "changing resync lce: %d[%u;%02lx]"
+                               drbd_warn(device, "changing resync lce: %d[%u;%02lx]"
                                     " -> %d[%u;00]\n",
                                     ext->lce.lc_number, ext->rs_left,
                                     ext->flags, enr, rs_left);
                                ext->flags = 0;
                        }
                        if (ext->rs_failed) {
-                               dev_warn(DEV, "Kicking resync_lru element enr=%u "
+                               drbd_warn(device, "Kicking resync_lru element enr=%u "
                                     "out with rs_failed=%d\n",
                                     ext->lce.lc_number, ext->rs_failed);
                        }
@@ -798,11 +798,11 @@ static void drbd_try_clear_on_disk_bm(struct drbd_device *device, sector_t secto
                                udw->w.device = device;
                                drbd_queue_work_front(&first_peer_device(device)->connection->sender_work, &udw->w);
                        } else {
-                               dev_warn(DEV, "Could not kmalloc an udw\n");
+                               drbd_warn(device, "Could not kmalloc an udw\n");
                        }
                }
        } else {
-               dev_err(DEV, "lc_get() failed! locked=%d/%d flags=%lu\n",
+               drbd_err(device, "lc_get() failed! locked=%d/%d flags=%lu\n",
                    device->resync_locked,
                    device->resync->nr_elements,
                    device->resync->flags);
@@ -843,7 +843,7 @@ void __drbd_set_in_sync(struct drbd_device *device, sector_t sector, int size,
        unsigned long flags;
 
        if (size <= 0 || !IS_ALIGNED(size, 512) || size > DRBD_MAX_BIO_SIZE) {
-               dev_err(DEV, "drbd_set_in_sync: sector=%llus size=%d nonsense!\n",
+               drbd_err(device, "drbd_set_in_sync: sector=%llus size=%d nonsense!\n",
                                (unsigned long long)sector, size);
                return;
        }
@@ -917,7 +917,7 @@ int __drbd_set_out_of_sync(struct drbd_device *device, sector_t sector, int size
                return 0;
 
        if (size < 0 || !IS_ALIGNED(size, 512) || size > DRBD_MAX_BIO_SIZE) {
-               dev_err(DEV, "sector: %llus, size: %d\n",
+               drbd_err(device, "sector: %llus, size: %d\n",
                        (unsigned long long)sector, size);
                return 0;
        }
@@ -988,7 +988,7 @@ struct bm_extent *_bme_get(struct drbd_device *device, unsigned int enr)
 
        if (!bm_ext) {
                if (rs_flags & LC_STARVING)
-                       dev_warn(DEV, "Have to wait for element"
+                       drbd_warn(device, "Have to wait for element"
                             " (resync LRU too small?)\n");
                BUG_ON(rs_flags & LC_LOCKED);
        }
@@ -1049,7 +1049,7 @@ retry:
                        if (schedule_timeout_interruptible(HZ/10))
                                return -EINTR;
                        if (sa && --sa == 0)
-                               dev_warn(DEV,"drbd_rs_begin_io() stepped aside for 20sec."
+                               drbd_warn(device, "drbd_rs_begin_io() stepped aside for 20sec."
                                         "Resync stalled?\n");
                        goto retry;
                }
@@ -1101,7 +1101,7 @@ int drbd_try_rs_begin_io(struct drbd_device *device, sector_t sector)
                                device->resync_locked--;
                        wake_up(&device->al_wait);
                } else {
-                       dev_alert(DEV, "LOGIC BUG\n");
+                       drbd_alert(device, "LOGIC BUG\n");
                }
        }
        /* TRY. */
@@ -1131,7 +1131,7 @@ int drbd_try_rs_begin_io(struct drbd_device *device, sector_t sector)
                if (!bm_ext) {
                        const unsigned long rs_flags = device->resync->flags;
                        if (rs_flags & LC_STARVING)
-                               dev_warn(DEV, "Have to wait for element"
+                               drbd_warn(device, "Have to wait for element"
                                     " (resync LRU too small?)\n");
                        BUG_ON(rs_flags & LC_LOCKED);
                        goto try_again;
@@ -1179,13 +1179,13 @@ void drbd_rs_complete_io(struct drbd_device *device, sector_t sector)
        if (!bm_ext) {
                spin_unlock_irqrestore(&device->al_lock, flags);
                if (__ratelimit(&drbd_ratelimit_state))
-                       dev_err(DEV, "drbd_rs_complete_io() called, but extent not found\n");
+                       drbd_err(device, "drbd_rs_complete_io() called, but extent not found\n");
                return;
        }
 
        if (bm_ext->lce.refcnt == 0) {
                spin_unlock_irqrestore(&device->al_lock, flags);
-               dev_err(DEV, "drbd_rs_complete_io(,%llu [=%u]) called, "
+               drbd_err(device, "drbd_rs_complete_io(,%llu [=%u]) called, "
                    "but refcnt is 0!?\n",
                    (unsigned long long)sector, enr);
                return;
@@ -1241,7 +1241,7 @@ int drbd_rs_del_all(struct drbd_device *device)
                        if (bm_ext->lce.lc_number == LC_FREE)
                                continue;
                        if (bm_ext->lce.lc_number == device->resync_wenr) {
-                               dev_info(DEV, "dropping %u in drbd_rs_del_all, apparently"
+                               drbd_info(device, "dropping %u in drbd_rs_del_all, apparently"
                                     " got 'synced' by application io\n",
                                     device->resync_wenr);
                                D_ASSERT(!test_bit(BME_LOCKED, &bm_ext->flags));
@@ -1251,7 +1251,7 @@ int drbd_rs_del_all(struct drbd_device *device)
                                lc_put(device->resync, &bm_ext->lce);
                        }
                        if (bm_ext->lce.refcnt != 0) {
-                               dev_info(DEV, "Retrying drbd_rs_del_all() later. "
+                               drbd_info(device, "Retrying drbd_rs_del_all() later. "
                                     "refcnt=%d\n", bm_ext->lce.refcnt);
                                put_ldev(device);
                                spin_unlock_irq(&device->al_lock);
@@ -1285,7 +1285,7 @@ void drbd_rs_failed_io(struct drbd_device *device, sector_t sector, int size)
        int wake_up = 0;
 
        if (size <= 0 || !IS_ALIGNED(size, 512) || size > DRBD_MAX_BIO_SIZE) {
-               dev_err(DEV, "drbd_rs_failed_io: sector=%llus size=%d nonsense!\n",
+               drbd_err(device, "drbd_rs_failed_io: sector=%llus size=%d nonsense!\n",
                                (unsigned long long)sector, size);
                return;
        }

diff --cc drivers/block/drbd/drbd_bitmap.c
Simple merge

diff --cc drivers/block/drbd/drbd_int.h
Simple merge

diff --cc drivers/block/drbd/drbd_main.c
Simple merge

diff --cc drivers/block/drbd/drbd_nl.c
Simple merge

diff --cc drivers/block/drbd/drbd_receiver.c
Simple merge

diff --cc drivers/block/drbd/drbd_req.c
Simple merge

diff --cc drivers/block/drbd/drbd_state.c
Simple merge

diff --cc drivers/block/drbd/drbd_worker.c
Simple merge