Commit d0456c72 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: simplify conn_all_vols_unconf, make it bool 



Get rid of a temporary variable and, funny bitand assignment.
Just short circuit, returning false, once we encounter the first
still configured volume.

FIXME verify call sites for need of rcu_read_lock or stronger.

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

drivers/block/drbd/drbd_state.c

+7 −9
Original line number Diff line number Diff line
@@ -47,20 +47,18 @@ static enum drbd_state_rv is_valid_transition(union drbd_state os, union drbd_st 
static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state ns,

				       const char **warn_sync_abort);



int conn_all_vols_unconf(struct drbd_tconn *tconn)

bool conn_all_vols_unconf(struct drbd_tconn *tconn)

{

	struct drbd_conf *mdev;

	int minor, uncfg = 1;

	int minor;



	idr_for_each_entry(&tconn->volumes, mdev, minor) {

		uncfg &= (mdev->state.disk == D_DISKLESS &&

			  mdev->state.conn == C_STANDALONE &&

			  mdev->state.role == R_SECONDARY);

		if (!uncfg)

			break;

		if (mdev->state.disk != D_DISKLESS ||

		    mdev->state.conn != C_STANDALONE ||

		    mdev->state.role != R_SECONDARY)

			return false;

	}



	return uncfg;

	return true;

}



/**

drivers/block/drbd/drbd_state.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_s 
		   enum chg_state_flags flags);



extern void drbd_resume_al(struct drbd_conf *mdev);

extern int conn_all_vols_unconf(struct drbd_tconn *tconn);

extern bool conn_all_vols_unconf(struct drbd_tconn *tconn);



/**

 * drbd_request_state() - Reqest a state change