aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_int.h
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-11-10 06:08:37 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 05:35:06 -0500
commit3719094ec2dec411b3151f10048316d787e086f9 (patch)
tree4be7bd2bb31612e8210665b9e20985de7deb30e4 /drivers/block/drbd/drbd_int.h
parentab17b68f4579b460753a416b0afc4446381d876f (diff)
drbd: Starting with protocol 96 we can allow app-IO while receiving the bitmap
* C_STARTING_SYNC_S, C_STARTING_SYNC_T In these states the bitmap gets written to disk. Locking out of app-IO is done by using the drbd_queue_bitmap_io() and drbd_bitmap_io() functions these days. It is no longer necessary to lock out app-IO based on the connection state. App-IO that may come in after the BITMAP_IO flag got cleared before the state transition to C_SYNC_(SOURCE|TARGET) does not get mirrored, sets a bit in the local bitmap, that is already set, therefore changes nothing. * C_WF_BITMAP_S In this state we send updates (P_OUT_OF_SYNC packets). With that we make sure they have the same number of bits when going into the C_SYNC_(SOURCE|TARGET) connection state. * C_UNCONNECTED: The receiver starts, no need to lock out IO. * C_DISCONNECTING: in drbd_disconnect() we had a wait_event() to wait until ap_bio_cnt reaches 0. Removed that. * C_TIMEOUT, C_BROKEN_PIPE, C_NETWORK_FAILURE C_PROTOCOL_ERROR, C_TEAR_DOWN: Same as C_DISCONNECTING * C_WF_REPORT_PARAMS: IO still possible since that is still like C_WF_CONNECTION. And we do not need to send barriers in C_WF_BITMAP_S connection state. Allow concurrent accesses to the bitmap when receiving the bitmap. Everything gets ORed anyways. A drbd_free_tl_hash() is in after_state_chg_work(). At that point all the work items of the last connections must have been processed. Introduced a call to drbd_free_tl_hash() into drbd_free_mdev() for paranoia reasons. 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_int.h')
-rw-r--r--drivers/block/drbd/drbd_int.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 9a944604939f..38bbaba8bd89 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -2213,8 +2213,9 @@ static inline int drbd_get_max_buffers(struct drbd_conf *mdev)
2213 return mxb; 2213 return mxb;
2214} 2214}
2215 2215
2216static inline int drbd_state_is_stable(union drbd_state s) 2216static inline int drbd_state_is_stable(struct drbd_conf *mdev)
2217{ 2217{
2218 union drbd_state s = mdev->state;
2218 2219
2219 /* DO NOT add a default clause, we want the compiler to warn us 2220 /* DO NOT add a default clause, we want the compiler to warn us
2220 * for any newly introduced state we may have forgotten to add here */ 2221 * for any newly introduced state we may have forgotten to add here */
@@ -2233,11 +2234,7 @@ static inline int drbd_state_is_stable(union drbd_state s)
2233 case C_PAUSED_SYNC_T: 2234 case C_PAUSED_SYNC_T:
2234 case C_AHEAD: 2235 case C_AHEAD:
2235 case C_BEHIND: 2236 case C_BEHIND:
2236 /* maybe stable, look at the disk state */ 2237 /* transitional states, IO allowed */
2237 break;
2238
2239 /* no new io accepted during tansitional states
2240 * like handshake or teardown */
2241 case C_DISCONNECTING: 2238 case C_DISCONNECTING:
2242 case C_UNCONNECTED: 2239 case C_UNCONNECTED:
2243 case C_TIMEOUT: 2240 case C_TIMEOUT:
@@ -2248,7 +2245,15 @@ static inline int drbd_state_is_stable(union drbd_state s)
2248 case C_WF_REPORT_PARAMS: 2245 case C_WF_REPORT_PARAMS:
2249 case C_STARTING_SYNC_S: 2246 case C_STARTING_SYNC_S:
2250 case C_STARTING_SYNC_T: 2247 case C_STARTING_SYNC_T:
2248 break;
2249
2250 /* Allow IO in BM exchange states with new protocols */
2251 case C_WF_BITMAP_S: 2251 case C_WF_BITMAP_S:
2252 if (mdev->agreed_pro_version < 96)
2253 return 0;
2254 break;
2255
2256 /* no new io accepted in these states */
2252 case C_WF_BITMAP_T: 2257 case C_WF_BITMAP_T:
2253 case C_WF_SYNC_UUID: 2258 case C_WF_SYNC_UUID:
2254 case C_MASK: 2259 case C_MASK:
@@ -2297,7 +2302,7 @@ static inline int __inc_ap_bio_cond(struct drbd_conf *mdev)
2297 * to start during "stable" states. */ 2302 * to start during "stable" states. */
2298 2303
2299 /* no new io accepted when attaching or detaching the disk */ 2304 /* no new io accepted when attaching or detaching the disk */
2300 if (!drbd_state_is_stable(mdev->state)) 2305 if (!drbd_state_is_stable(mdev))
2301 return 0; 2306 return 0;
2302 2307
2303 /* since some older kernels don't have atomic_add_unless, 2308 /* since some older kernels don't have atomic_add_unless,