drbd: log request sector offset and size for IO errors

Signed-off-by: Philipp Reisner <[email protected]>
Signed-off-by: Lars Ellenberg <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index d9e5962a9a8c0aa9ec7b81e3629e83fe3e54ed6c..135ea76ed502f720a2e742ad54dd84927a8cfa00 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -387,6 +387,20 @@ out_conflict:
        return 1;
 }
 
        return 1;
 }
 

+static void drbd_report_io_error(struct drbd_conf *mdev, struct drbd_request *req)
+{
+        char b[BDEVNAME_SIZE];
+
+       if (__ratelimit(&drbd_ratelimit_state))
+               return;
+
+       dev_warn(DEV, "local %s IO error sector %llu+%u on %s\n",
+                       (req->rq_state & RQ_WRITE) ? "WRITE" : "READ",
+                       (unsigned long long)req->sector,
+                       req->size >> 9,
+                       bdevname(mdev->ldev->backing_bdev, b));
+}
+

 /* obviously this could be coded as many single functions
  * instead of one huge switch,
  * or by putting the code directly in the respective locations
 /* obviously this could be coded as many single functions
  * instead of one huge switch,
  * or by putting the code directly in the respective locations


@@ -455,6 +469,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
                req->rq_state |= RQ_LOCAL_COMPLETED;
                req->rq_state &= ~RQ_LOCAL_PENDING;
 
                req->rq_state |= RQ_LOCAL_COMPLETED;
                req->rq_state &= ~RQ_LOCAL_PENDING;
 

+               drbd_report_io_error(mdev, req);

                __drbd_chk_io_error(mdev, DRBD_WRITE_ERROR);
                _req_may_be_done_not_susp(req, m);
                break;
                __drbd_chk_io_error(mdev, DRBD_WRITE_ERROR);
                _req_may_be_done_not_susp(req, m);
                break;


@@ -477,6 +492,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
                        break;
                }
 
                        break;
                }
 

+               drbd_report_io_error(mdev, req);

                __drbd_chk_io_error(mdev, DRBD_READ_ERROR);
 
        goto_queue_for_net_read:
                __drbd_chk_io_error(mdev, DRBD_READ_ERROR);
 
        goto_queue_for_net_read:


@@ -900,7 +916,8 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio, uns
 
        if (!(local || remote) && !is_susp(mdev->state)) {
                if (__ratelimit(&drbd_ratelimit_state))
 
        if (!(local || remote) && !is_susp(mdev->state)) {
                if (__ratelimit(&drbd_ratelimit_state))

-                       dev_err(DEV, "IO ERROR: neither local nor remote disk\n");
+                       dev_err(DEV, "IO ERROR: neither local nor remote data, sector %llu+%u\n",
+                                       (unsigned long long)req->sector, req->size >> 9);

                goto fail_free_complete;
        }
 
                goto fail_free_complete;
        }
 

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 4a7eccbd1292bcfd7fefbb3fc278ed880ccd2d4a..94f58a102bbb97a145d29e849b1ab2fda8f2de25 100644 (file)
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -53,7 +53,7 @@
 
 
 extern const char *drbd_buildtag(void);
 
 
 extern const char *drbd_buildtag(void);

-#define REL_VERSION "8.3.13"
+#define REL_VERSION "8.3.14"

 #define API_VERSION 88
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 97
 #define API_VERSION 88
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 97