lkml.org 
[lkml]   [2011]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 51/54] drbd: drbd_may_do_local_read(): Use bool/true/false
    Date
    From: Andreas Gruenbacher <agruen@linbit.com>

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    ---
    drivers/block/drbd/drbd_req.c | 9 ++++-----
    1 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
    index f91f9c9..3430dab 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;
    }

    /*
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-09-05 13:51    [W:0.021 / U:1.440 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site