From 8d466e2abe7c995a287b607668a22bfd35083682 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Mon, 21 Feb 2011 12:34:58 +0100 Subject: [PATCH] --- yaml --- r: 345818 b: refs/heads/master c: 8ca9844f105acf6981751e39c1ac1a240afe5a2b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d2ad7e2e18cb..dd7b13612846 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0e22a260c5142171c730436664febb045b9f0f0 +refs/heads/master: 8ca9844f105acf6981751e39c1ac1a240afe5a2b diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index 18eb3d17f174..157c73743408 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -667,10 +667,9 @@ static int drbd_may_do_local_read(struct drbd_conf *mdev, sector_t sector, int s return 0; if (mdev->state.disk < D_INCONSISTENT) return 0; - /* state.disk == D_INCONSISTENT We will have a look at the BitMap */ - nr_sectors = drbd_get_capacity(mdev->this_bdev); esector = sector + (size >> 9) - 1; + nr_sectors = drbd_get_capacity(mdev->this_bdev); D_ASSERT(sector < nr_sectors); D_ASSERT(esector < nr_sectors);