From 77b0b1aa16813aa4afa26446183eca38e09ae4d0 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Thu, 10 Mar 2011 23:28:13 +0100 Subject: [PATCH] --- yaml --- r: 345861 b: refs/heads/master c: d0456c72df5fb3b800ba9b0ec2465fdbcaf29a7f h: refs/heads/master i: 345859: ad72ed5597651fb0c5e1521cd73e669eafab107d v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_state.c | 16 +++++++--------- trunk/drivers/block/drbd/drbd_state.h | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ea65fa126e4a..6fd90ef8aae4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 543cc10b4cc5c60aa9fcc62705ccfb9998bf4697 +refs/heads/master: d0456c72df5fb3b800ba9b0ec2465fdbcaf29a7f diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index a280bc238acd..c27d3778cae6 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/drivers/block/drbd/drbd_state.c @@ -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; } /** diff --git a/trunk/drivers/block/drbd/drbd_state.h b/trunk/drivers/block/drbd/drbd_state.h index d9536cd798e5..55df0728bc88 100644 --- a/trunk/drivers/block/drbd/drbd_state.h +++ b/trunk/drivers/block/drbd/drbd_state.h @@ -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