]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drbd: simplify condition in drbd_may_do_local_read()
authorLars Ellenberg <lars.ellenberg@linbit.com>
Fri, 18 Feb 2011 13:13:07 +0000 (14:13 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 14 Oct 2011 14:47:39 +0000 (16:47 +0200)
fold
if (x >= (N+1))
return 0;
if (x < N)
return 0;
into
if (x != N)
return 0;

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_req.c

index 48d313dcae7d42959203ef89b756187d50df6c38..733219884ab7883eb25a0090a30331f2dd91f6fc 100644 (file)
@@ -663,9 +663,7 @@ static int drbd_may_do_local_read(struct drbd_conf *mdev, sector_t sector, int s
 
        if (mdev->state.disk == D_UP_TO_DATE)
                return 1;
-       if (mdev->state.disk >= D_OUTDATED)
-               return 0;
-       if (mdev->state.disk <  D_INCONSISTENT)
+       if (mdev->state.disk != D_INCONSISTENT)
                return 0;
        esector = sector + (size >> 9) - 1;