Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f497609e authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Get rid of MR_{READ,WRITE}_SHIFT 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 823bd832

drivers/block/drbd/drbd_main.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

drivers/block/drbd/drbd_req.h

+2 −4
Original line number Diff line number Diff line
@@ -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)

{