From 626e9b907923eb4803a6cdd82619fef1d9f9534c Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 16 Jan 2012 12:14:01 +0100 Subject: [PATCH] --- yaml --- r: 309331 b: refs/heads/master c: fc28845bc005995b41ae8c83c7922d088f0ad228 h: refs/heads/master i: 309329: 81564bec69e0b0fcb87ec12f360803af38e7e125 309327: f07c5d53814b5cfc1e9c07bb9ea14929667635b4 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 119ceb8f337d..35dca3773d49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 031a7c173ffda664ac5551bd13c313e513dd87a7 +refs/heads/master: fc28845bc005995b41ae8c83c7922d088f0ad228 diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index 810070146862..4fc7f98d9856 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -786,6 +786,7 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio, uns int local, remote, send_oos = 0; int err = -EIO; int ret = 0; + union drbd_state s; /* allocate outside of all locks; */ req = drbd_req_new(mdev, bio); @@ -847,8 +848,9 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio, uns drbd_al_begin_io(mdev, sector); } - remote = remote && drbd_should_do_remote(mdev->state); - send_oos = rw == WRITE && drbd_should_send_oos(mdev->state); + s = mdev->state; + remote = remote && drbd_should_do_remote(s); + send_oos = rw == WRITE && drbd_should_send_oos(s); D_ASSERT(!(remote && send_oos)); if (!(local || remote) && !is_susp(mdev->state)) {