diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-07-05 09:38:59 -0400 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:57:50 -0500 |
| commit | cdfda633d235028e9b27381dedb65416409e8729 (patch) | |
| tree | c2b07a9b0f1bfb2bb04dd118df15a53ff2592ade /drivers/block/drbd/drbd_state.c | |
| parent | 2fcb8f307f6014de9e771799d9ec0f050802c0ac (diff) | |
drbd: detach from frozen backing device
* drbd-8.3:
documentation: Documented detach's --force and disk's --disk-timeout
drbd: Implemented the disk-timeout option
drbd: Force flag for the detach operation
drbd: Allow new IOs while the local disk in in FAILED state
drbd: Bitmap IO functions can not return prematurely if the disk breaks
drbd: Added a kref to bm_aio_ctx
drbd: Hold a reference to ldev while doing meta-data IO
drbd: Keep a reference to the bio until the completion handler finished
drbd: Implemented wait_until_done_or_disk_failure()
drbd: Replaced md_io_mutex by an atomic: md_io_in_use
drbd: moved md_io into mdev
drbd: Immediately allow completion of IOs, that wait for IO completions on a failed disk
drbd: Keep a reference to barrier acked requests
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, 7 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 4c13a6f4f184..f51cefdbeff3 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c | |||
| @@ -29,6 +29,9 @@ | |||
| 29 | #include "drbd_int.h" | 29 | #include "drbd_int.h" |
| 30 | #include "drbd_req.h" | 30 | #include "drbd_req.h" |
| 31 | 31 | ||
| 32 | /* in drbd_main.c */ | ||
| 33 | extern void tl_apply(struct drbd_conf *mdev, enum drbd_req_event what); | ||
| 34 | |||
| 32 | struct after_state_chg_work { | 35 | struct after_state_chg_work { |
| 33 | struct drbd_work w; | 36 | struct drbd_work w; |
| 34 | union drbd_state os; | 37 | union drbd_state os; |
| @@ -1315,6 +1318,10 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, | |||
| 1315 | rcu_read_unlock(); | 1318 | rcu_read_unlock(); |
| 1316 | was_io_error = test_and_clear_bit(WAS_IO_ERROR, &mdev->flags); | 1319 | was_io_error = test_and_clear_bit(WAS_IO_ERROR, &mdev->flags); |
| 1317 | 1320 | ||
| 1321 | /* Immediately allow completion of all application IO, that waits | ||
| 1322 | for completion from the local disk. */ | ||
| 1323 | tl_apply(mdev, ABORT_DISK_IO); | ||
| 1324 | |||
| 1318 | /* current state still has to be D_FAILED, | 1325 | /* current state still has to be D_FAILED, |
| 1319 | * there is only one way out: to D_DISKLESS, | 1326 | * there is only one way out: to D_DISKLESS, |
| 1320 | * and that may only happen after our put_ldev below. */ | 1327 | * and that may only happen after our put_ldev below. */ |