diff options
author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2011-03-07 06:49:34 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-03 19:16:17 -0400 |
commit | 3b98c0c2093d1f92e5b7394ae0b13d142e7ef880 (patch) | |
tree | 43d24df845b0c63ca0689b1aa094623ae0f999d0 /drivers/block/drbd/drbd_state.c | |
parent | ec2c35ac1ea288f5c931e32452ecea50068e8450 (diff) |
drbd: switch configuration interface from connector to genetlink
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
-rw-r--r-- | drivers/block/drbd/drbd_state.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index ffee90d6d374..a280bc238acd 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c | |||
@@ -970,6 +970,11 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, | |||
970 | enum drbd_fencing_p fp; | 970 | enum drbd_fencing_p fp; |
971 | enum drbd_req_event what = NOTHING; | 971 | enum drbd_req_event what = NOTHING; |
972 | union drbd_state nsm = (union drbd_state){ .i = -1 }; | 972 | union drbd_state nsm = (union drbd_state){ .i = -1 }; |
973 | struct sib_info sib; | ||
974 | |||
975 | sib.sib_reason = SIB_STATE_CHANGE; | ||
976 | sib.os = os; | ||
977 | sib.ns = ns; | ||
973 | 978 | ||
974 | if (os.conn != C_CONNECTED && ns.conn == C_CONNECTED) { | 979 | if (os.conn != C_CONNECTED && ns.conn == C_CONNECTED) { |
975 | clear_bit(CRASHED_PRIMARY, &mdev->flags); | 980 | clear_bit(CRASHED_PRIMARY, &mdev->flags); |
@@ -984,7 +989,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, | |||
984 | } | 989 | } |
985 | 990 | ||
986 | /* Inform userspace about the change... */ | 991 | /* Inform userspace about the change... */ |
987 | drbd_bcast_state(mdev, ns); | 992 | drbd_bcast_event(mdev, &sib); |
988 | 993 | ||
989 | if (!(os.role == R_PRIMARY && os.disk < D_UP_TO_DATE && os.pdsk < D_UP_TO_DATE) && | 994 | if (!(os.role == R_PRIMARY && os.disk < D_UP_TO_DATE && os.pdsk < D_UP_TO_DATE) && |
990 | (ns.role == R_PRIMARY && ns.disk < D_UP_TO_DATE && ns.pdsk < D_UP_TO_DATE)) | 995 | (ns.role == R_PRIMARY && ns.disk < D_UP_TO_DATE && ns.pdsk < D_UP_TO_DATE)) |