diff options
Diffstat (limited to 'drivers/block/drbd/drbd_actlog.c')
-rw-r--r-- | drivers/block/drbd/drbd_actlog.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c index b895470e53d7..ac04ef97eac2 100644 --- a/drivers/block/drbd/drbd_actlog.c +++ b/drivers/block/drbd/drbd_actlog.c | |||
@@ -1119,7 +1119,7 @@ static int _is_in_al(struct drbd_conf *mdev, unsigned int enr) | |||
1119 | * @mdev: DRBD device. | 1119 | * @mdev: DRBD device. |
1120 | * @sector: The sector number. | 1120 | * @sector: The sector number. |
1121 | * | 1121 | * |
1122 | * This functions sleeps on al_wait. Returns 1 on success, 0 if interrupted. | 1122 | * This functions sleeps on al_wait. Returns 0 on success, -EINTR if interrupted. |
1123 | */ | 1123 | */ |
1124 | int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector) | 1124 | int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector) |
1125 | { | 1125 | { |
@@ -1130,10 +1130,10 @@ int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector) | |||
1130 | sig = wait_event_interruptible(mdev->al_wait, | 1130 | sig = wait_event_interruptible(mdev->al_wait, |
1131 | (bm_ext = _bme_get(mdev, enr))); | 1131 | (bm_ext = _bme_get(mdev, enr))); |
1132 | if (sig) | 1132 | if (sig) |
1133 | return 0; | 1133 | return -EINTR; |
1134 | 1134 | ||
1135 | if (test_bit(BME_LOCKED, &bm_ext->flags)) | 1135 | if (test_bit(BME_LOCKED, &bm_ext->flags)) |
1136 | return 1; | 1136 | return 0; |
1137 | 1137 | ||
1138 | for (i = 0; i < AL_EXT_PER_BM_SECT; i++) { | 1138 | for (i = 0; i < AL_EXT_PER_BM_SECT; i++) { |
1139 | sig = wait_event_interruptible(mdev->al_wait, | 1139 | sig = wait_event_interruptible(mdev->al_wait, |
@@ -1146,13 +1146,11 @@ int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector) | |||
1146 | wake_up(&mdev->al_wait); | 1146 | wake_up(&mdev->al_wait); |
1147 | } | 1147 | } |
1148 | spin_unlock_irq(&mdev->al_lock); | 1148 | spin_unlock_irq(&mdev->al_lock); |
1149 | return 0; | 1149 | return -EINTR; |
1150 | } | 1150 | } |
1151 | } | 1151 | } |
1152 | |||
1153 | set_bit(BME_LOCKED, &bm_ext->flags); | 1152 | set_bit(BME_LOCKED, &bm_ext->flags); |
1154 | 1153 | return 0; | |
1155 | return 1; | ||
1156 | } | 1154 | } |
1157 | 1155 | ||
1158 | /** | 1156 | /** |