From 8b4d483895c6552997c50419e2b9782139cc25d5 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 7 Mar 2012 13:41:52 +0100 Subject: [PATCH] --- yaml --- r: 346165 b: refs/heads/master c: 38a05c16b8fc855db2294eec36fde2c665b14e8f h: refs/heads/master i: 346163: dc906cb69dabdb8b1d5d4a25e2033fd4fd40f711 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 651921edc87a..b9b2337c066a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72585d2428fa3a0daab02ebad1f41e5ef517dbaa +refs/heads/master: 38a05c16b8fc855db2294eec36fde2c665b14e8f diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index bfd14bc9693d..3e4dc070d3ff 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -1154,7 +1154,6 @@ void request_timer_fn(unsigned long data) struct drbd_conf *mdev = (struct drbd_conf *) data; struct drbd_tconn *tconn = mdev->tconn; struct drbd_request *req; /* oldest request */ - struct block_device *bdev; struct list_head *le; struct net_conf *nc; unsigned long ent = 0, dt = 0, et, nt; /* effective timeout = ko_count * timeout */ @@ -1165,7 +1164,6 @@ void request_timer_fn(unsigned long data) if (get_ldev(mdev)) { dt = rcu_dereference(mdev->ldev->disk_conf)->disk_timeout * HZ / 10; - bdev = mdev->ldev->backing_bdev; put_ldev(mdev); } rcu_read_unlock(); @@ -1191,7 +1189,7 @@ void request_timer_fn(unsigned long data) _drbd_set_state(_NS(mdev, conn, C_TIMEOUT), CS_VERBOSE | CS_HARD, NULL); } } - if (dt && req->rq_state & RQ_LOCAL_PENDING && req->private_bio->bi_bdev == bdev) { + if (dt && req->rq_state & RQ_LOCAL_PENDING && req->w.mdev == mdev) { if (time_is_before_eq_jiffies(req->start_time + dt)) { dev_warn(DEV, "Local backing device failed to meet the disk-timeout\n"); __drbd_chk_io_error(mdev, 1);