summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2014-09-11 14:29:08 +0200
committerJens Axboe <axboe@fb.com>2014-09-11 16:41:29 +0200
commit8d4ba3f0fa53044b8b597caaa7d8e291e6e84642 (patch)
tree5b06e3c9506d9a1a6ec61fc0391010c050502a1d /drivers/block
parentdrbd: Remove superfluous newline from "resync_extents" debugfs entry. (diff)
downloadlinux-8d4ba3f0fa53044b8b597caaa7d8e291e6e84642.tar.xz
linux-8d4ba3f0fa53044b8b597caaa7d8e291e6e84642.zip
drbd: Avoid inconsistent locking warning
request_timer_fn() takes resource->req_lock via the device and releases it via the connection. Avoid this as it is confusing static code checkers. Reported-by: "Dan Carpenter" <dan.carpenter@oracle.com> Signed-off-by: Andreas Gruenbacher <agruen@linbit.com> Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_req.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index c67717d572d1..5a01c53dddeb 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1645,6 +1645,6 @@ void request_timer_fn(unsigned long data)
? oldest_submit_jif + dt : now + et;
nt = time_before(ent, dt) ? ent : dt;
out:
- spin_unlock_irq(&connection->resource->req_lock);
+ spin_unlock_irq(&device->resource->req_lock);
mod_timer(&device->request_timer, nt);
}