evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drbd: Fixed inc_ap_bio()

Browse source 
The condition must be checked after perpare_to_wait(). The old
implementaion could loose wakeup events. Never observed in real
life.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2010-11-17 18:24:19 +01:00
parent 127b317844
commit 8869d683b7
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/block/drbd/drbd_int.h
View file

@ -2309,15 +2309,21 @@ static inline int __inc_ap_bio_cond(struct drbd_conf *mdev)
return 1; return 1;
} }
/* I'd like to use wait_event_lock_irq, static inline int _inc_ap_bio_cond(struct drbd_conf *mdev, int count)
* but I'm not sure when it got introduced, {
* and not sure when it has 3 or 4 arguments */ int rv = 0;
spin_lock_irq(&mdev->req_lock);
rv = __inc_ap_bio_cond(mdev);
if (rv)
atomic_add(count, &mdev->ap_bio_cnt);
spin_unlock_irq(&mdev->req_lock);
return rv;
}
static inline void inc_ap_bio(struct drbd_conf *mdev, int count) static inline void inc_ap_bio(struct drbd_conf *mdev, int count)
{ {
/* compare with after_state_ch,
* os.conn != C_WF_BITMAP_S && ns.conn == C_WF_BITMAP_S */
DEFINE_WAIT(wait);
/* we wait here /* we wait here
* as long as the device is suspended * as long as the device is suspended
* until the bitmap is no longer on the fly during connection * until the bitmap is no longer on the fly during connection
@ -2326,16 +2332,7 @@ static inline void inc_ap_bio(struct drbd_conf *mdev, int count)
* to avoid races with the reconnect code, * to avoid races with the reconnect code,
* we need to atomic_inc within the spinlock. */ * we need to atomic_inc within the spinlock. */
spin_lock_irq(&mdev->req_lock); wait_event(mdev->misc_wait, _inc_ap_bio_cond(mdev, count));
while (!__inc_ap_bio_cond(mdev)) {
prepare_to_wait(&mdev->misc_wait, &wait, TASK_UNINTERRUPTIBLE);
spin_unlock_irq(&mdev->req_lock);
schedule();
finish_wait(&mdev->misc_wait, &wait);
spin_lock_irq(&mdev->req_lock);
}
atomic_add(count, &mdev->ap_bio_cnt);
spin_unlock_irq(&mdev->req_lock);
} }
static inline void dec_ap_bio(struct drbd_conf *mdev) static inline void dec_ap_bio(struct drbd_conf *mdev)