From cb88c727414fdc5172f9e22cd3849c8b537e4bda Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sun, 17 Jul 2011 23:06:12 +0200 Subject: [PATCH] --- yaml --- r: 346121 b: refs/heads/master c: f497609e4c50c6162b51359d560f2454b184e0ec h: refs/heads/master i: 346119: 5fd5d6d4065e8419b62600beed0e4d6a09a50a15 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 6 ++++-- trunk/drivers/block/drbd/drbd_req.h | 6 ++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2bd89f70e011..9d96eea6b96f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 823bd832a60dcf4bf9c162112f34f2f1783d0eaa +refs/heads/master: f497609e4c50c6162b51359d560f2454b184e0ec diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index c941d3a2b30c..2090b78231a2 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -368,8 +368,10 @@ void _tl_restart(struct drbd_tconn *tconn, enum drbd_req_event what) req = list_entry(le, struct drbd_request, tl_requests); rv = _req_mod(req, what); - n_writes += (rv & MR_WRITE) >> MR_WRITE_SHIFT; - n_reads += (rv & MR_READ) >> MR_READ_SHIFT; + if (rv & MR_WRITE) + n_writes++; + if (rv & MR_READ) + n_reads++; } tmp = b->next; diff --git a/trunk/drivers/block/drbd/drbd_req.h b/trunk/drivers/block/drbd/drbd_req.h index f6aff150addb..68f54050b7ca 100644 --- a/trunk/drivers/block/drbd/drbd_req.h +++ b/trunk/drivers/block/drbd/drbd_req.h @@ -235,10 +235,8 @@ enum drbd_req_state_bits { /* For waking up the frozen transfer log mod_req() has to return if the request should be counted in the epoch object*/ -#define MR_WRITE_SHIFT 0 -#define MR_WRITE (1 << MR_WRITE_SHIFT) -#define MR_READ_SHIFT 1 -#define MR_READ (1 << MR_READ_SHIFT) +#define MR_WRITE 1 +#define MR_READ 2 static inline void drbd_req_make_private_bio(struct drbd_request *req, struct bio *bio_src) {