summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher2010-12-19 20:48:29 +0100
committerPhilipp Reisner2012-11-08 16:44:49 +0100
commit0da34df0d05d004c1ec40f4c30a325d8727b0b33 (patch)
tree8439c3e3d4680f5900a8d030acfa33f7ae36781b /drivers/block/drbd/drbd_req.c
parentdrbd: Remove unnecessary assertion (diff)
downloadkernel-qcow2-linux-0da34df0d05d004c1ec40f4c30a325d8727b0b33.tar.gz
kernel-qcow2-linux-0da34df0d05d004c1ec40f4c30a325d8727b0b33.tar.xz
kernel-qcow2-linux-0da34df0d05d004c1ec40f4c30a325d8727b0b33.zip
drbd: drbd_may_do_local_read(): Use bool/true/false
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_req.c')
-rw-r--r--drivers/block/drbd/drbd_req.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index f91f9c9a815c..3430dab85720 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -671,17 +671,16 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
* since size may be bigger than BM_BLOCK_SIZE,
* we may need to check several bits.
*/
-static int drbd_may_do_local_read(struct drbd_conf *mdev, sector_t sector, int size)
+static bool drbd_may_do_local_read(struct drbd_conf *mdev, sector_t sector, int size)
{
unsigned long sbnr, ebnr;
sector_t esector, nr_sectors;
if (mdev->state.disk == D_UP_TO_DATE)
- return 1;
+ return true;
if (mdev->state.disk != D_INCONSISTENT)
- return 0;
+ return false;
esector = sector + (size >> 9) - 1;
-
nr_sectors = drbd_get_capacity(mdev->this_bdev);
D_ASSERT(sector < nr_sectors);
D_ASSERT(esector < nr_sectors);
@@ -689,7 +688,7 @@ static int drbd_may_do_local_read(struct drbd_conf *mdev, sector_t sector, int s
sbnr = BM_SECT_TO_BIT(sector);
ebnr = BM_SECT_TO_BIT(esector);
- return 0 == drbd_bm_count_bits(mdev, sbnr, ebnr);
+ return drbd_bm_count_bits(mdev, sbnr, ebnr) == 0;
}
/*