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

Commit 2e9ffde6 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Jens Axboe
Browse files

drbd: De-inline drbd_should_do_remote() and drbd_should_send_out_of_sync() 



There is no need to have these two as inline functions.  In addition,
drbd_should_send_out_of_sync() is only used in a single place, anyway.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3b8a44f8

drivers/block/drbd/drbd_req.c

+18 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,24 @@ static bool do_remote_read(struct drbd_request *req) 
	return false;

}



bool drbd_should_do_remote(union drbd_dev_state s)

{

	return s.pdsk == D_UP_TO_DATE ||

		(s.pdsk >= D_INCONSISTENT &&

		 s.conn >= C_WF_BITMAP_T &&

		 s.conn < C_AHEAD);

	/* Before proto 96 that was >= CONNECTED instead of >= C_WF_BITMAP_T.

	   That is equivalent since before 96 IO was frozen in the C_WF_BITMAP*

	   states. */

}



static bool drbd_should_send_out_of_sync(union drbd_dev_state s)

{

	return s.conn == C_AHEAD || s.conn == C_WF_BITMAP_S;

	/* pdsk = D_INCONSISTENT as a consequence. Protocol 96 check not necessary

	   since we enter state C_AHEAD only if proto >= 96 */

}



/* returns number of connections (== 1, for drbd 8.4)

 * expected to actually write this data,

 * which does NOT include those that we are L_AHEAD for. */

drivers/block/drbd/drbd_req.h

+1 −16
Original line number Diff line number Diff line
@@ -331,21 +331,6 @@ static inline int req_mod(struct drbd_request *req, 
	return rv;

}



static inline bool drbd_should_do_remote(union drbd_dev_state s)

{

	return s.pdsk == D_UP_TO_DATE ||

		(s.pdsk >= D_INCONSISTENT &&

		 s.conn >= C_WF_BITMAP_T &&

		 s.conn < C_AHEAD);

	/* Before proto 96 that was >= CONNECTED instead of >= C_WF_BITMAP_T.

	   That is equivalent since before 96 IO was frozen in the C_WF_BITMAP*

	   states. */

}

static inline bool drbd_should_send_out_of_sync(union drbd_dev_state s)

{

	return s.conn == C_AHEAD || s.conn == C_WF_BITMAP_S;

	/* pdsk = D_INCONSISTENT as a consequence. Protocol 96 check not necessary

	   since we enter state C_AHEAD only if proto >= 96 */

}

extern bool drbd_should_do_remote(union drbd_dev_state);



#endif