From 4b266e3f288dd8fe011ffeef28a0d4e345d973b3 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Mon, 26 Mar 2012 15:09:44 +0200 Subject: [PATCH] --- yaml --- r: 346166 b: refs/heads/master c: 81f448629aa25051c47b4d5b81702da8cbe922c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b9b2337c066a..33dc1c849b0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38a05c16b8fc855db2294eec36fde2c665b14e8f +refs/heads/master: 81f448629aa25051c47b4d5b81702da8cbe922c3 diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index 3e4dc070d3ff..c3f99bde0e11 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -822,6 +822,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s int local, remote, send_oos = 0; int err; int ret = 0; + union drbd_dev_state s; /* allocate outside of all locks; */ req = drbd_req_new(mdev, bio); @@ -884,8 +885,9 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s drbd_al_begin_io(mdev, &req->i); } - remote = remote && drbd_should_do_remote(mdev->state); - send_oos = rw == WRITE && drbd_should_send_out_of_sync(mdev->state); + s = mdev->state; + remote = remote && drbd_should_do_remote(s); + send_oos = rw == WRITE && drbd_should_send_out_of_sync(s); D_ASSERT(!(remote && send_oos)); if (!(local || remote) && !drbd_suspended(mdev)) {