Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 23:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drbd: Rename __inc_ap_bio_cond to may_inc_ap_bio

Browse Source 
The old name is confusing: the function does not increment anything.
Also rename _inc_ap_bio_cond to inc_ap_bio_cond: there is no need for
an underscore.
Finally, make it clear that these functions return boolean values.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Andreas Gruenbacher 2010-12-13 18:03:38 +01:00 committed by Philipp Reisner
parent 24dccabb39
commit 1b881ef775
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/block/drbd/drbd_int.h
View File

@ -2284,14 +2284,14 @@ static inline int is_susp(union drbd_state s)
return s.susp || s.susp_nod || s.susp_fen; return s.susp || s.susp_nod || s.susp_fen;
} }
static inline int __inc_ap_bio_cond(struct drbd_conf *mdev) static inline bool may_inc_ap_bio(struct drbd_conf *mdev)
{ {
int mxb = drbd_get_max_buffers(mdev); int mxb = drbd_get_max_buffers(mdev);
if (is_susp(mdev->state)) if (is_susp(mdev->state))
return 0; return false;
if (test_bit(SUSPEND_IO, &mdev->flags)) if (test_bit(SUSPEND_IO, &mdev->flags))
return 0; return false;
/* to avoid potential deadlock or bitmap corruption, /* to avoid potential deadlock or bitmap corruption,
* in various places, we only allow new application io * in various places, we only allow new application io
@ -2299,23 +2299,23 @@ static inline int __inc_ap_bio_cond(struct drbd_conf *mdev)
/* no new io accepted when attaching or detaching the disk */ /* no new io accepted when attaching or detaching the disk */
if (!drbd_state_is_stable(mdev)) if (!drbd_state_is_stable(mdev))
return 0; return false;
/* since some older kernels don't have atomic_add_unless, /* since some older kernels don't have atomic_add_unless,
* and we are within the spinlock anyways, we have this workaround. */ * and we are within the spinlock anyways, we have this workaround. */
if (atomic_read(&mdev->ap_bio_cnt) > mxb) if (atomic_read(&mdev->ap_bio_cnt) > mxb)
return 0; return false;
if (test_bit(BITMAP_IO, &mdev->flags)) if (test_bit(BITMAP_IO, &mdev->flags))
return 0; return false;
return 1; return true;
} }
static inline int _inc_ap_bio_cond(struct drbd_conf *mdev, int count) static inline bool inc_ap_bio_cond(struct drbd_conf *mdev, int count)
{ {
int rv = 0; bool rv = false;
spin_lock_irq(&mdev->req_lock); spin_lock_irq(&mdev->req_lock);
rv = __inc_ap_bio_cond(mdev); rv = may_inc_ap_bio(mdev);
if (rv) if (rv)
atomic_add(count, &mdev->ap_bio_cnt); atomic_add(count, &mdev->ap_bio_cnt);
spin_unlock_irq(&mdev->req_lock); spin_unlock_irq(&mdev->req_lock);
@ -2333,7 +2333,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. */
wait_event(mdev->misc_wait, _inc_ap_bio_cond(mdev, count)); wait_event(mdev->misc_wait, inc_ap_bio_cond(mdev, count));
} }
static inline void dec_ap_bio(struct drbd_conf *mdev) static inline void dec_ap_bio(struct drbd_conf *mdev)

2
drivers/block/drbd/drbd_main.c
View File

@ -3239,7 +3239,7 @@ static int drbd_congested(void *congested_data, int bdi_bits)
char reason = '-'; char reason = '-';
int r = 0; int r = 0;
if (!__inc_ap_bio_cond(mdev)) { if (!may_inc_ap_bio(mdev)) {
/* DRBD has frozen IO */ /* DRBD has frozen IO */
r = bdi_bits; r = bdi_bits;
reason = 'd'; reason = 'd';