Archived
14
0
Fork 0

md/bitmap: use proper accessor macro

Use COUNTER()/NEEDED() macro instead of open-coding them.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Namhyung Kim 2011-06-09 11:42:57 +10:00 committed by NeilBrown
parent 01393f3d58
commit 27d5ea04d0

View file

@ -1408,7 +1408,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect
return 0; return 0;
} }
if (unlikely((*bmc & COUNTER_MAX) == COUNTER_MAX)) { if (unlikely(COUNTER(*bmc) == COUNTER_MAX)) {
DEFINE_WAIT(__wait); DEFINE_WAIT(__wait);
/* note that it is safe to do the prepare_to_wait /* note that it is safe to do the prepare_to_wait
* after the test as long as we do it before dropping * after the test as long as we do it before dropping
@ -1480,10 +1480,10 @@ void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long secto
sysfs_notify_dirent_safe(bitmap->sysfs_can_clear); sysfs_notify_dirent_safe(bitmap->sysfs_can_clear);
} }
if (!success && ! (*bmc & NEEDED_MASK)) if (!success && !NEEDED(*bmc))
*bmc |= NEEDED_MASK; *bmc |= NEEDED_MASK;
if ((*bmc & COUNTER_MAX) == COUNTER_MAX) if (COUNTER(*bmc) == COUNTER_MAX)
wake_up(&bitmap->overflow_wait); wake_up(&bitmap->overflow_wait);
(*bmc)--; (*bmc)--;