diff options
| author | Andreas Gruenbacher | 2011-07-17 23:06:12 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:58:00 +0100 |
| commit | f497609e4c50c6162b51359d560f2454b184e0ec (patch) | |
| tree | 4b63a30f836223b184d6ff23524473e14997ec04 /drivers/block/drbd | |
| parent | drbd: Bugfix for the connection behavior (diff) | |
| download | kernel-qcow2-linux-f497609e4c50c6162b51359d560f2454b184e0ec.tar.gz kernel-qcow2-linux-f497609e4c50c6162b51359d560f2454b184e0ec.tar.xz kernel-qcow2-linux-f497609e4c50c6162b51359d560f2454b184e0ec.zip | |
drbd: Get rid of MR_{READ,WRITE}_SHIFT
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 6 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_req.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index c941d3a2b30c..2090b78231a2 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/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/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h index f6aff150addb..68f54050b7ca 100644 --- a/drivers/block/drbd/drbd_req.h +++ b/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) { |