[Drbd-dev] [PATCH 05/15] drbd: simplify condition in drbd_may_do_local_read()
Philipp Reisner
philipp.reisner at linbit.com
Tue Aug 30 11:05:39 CEST 2011
From: Lars Ellenberg <lars.ellenberg at linbit.com>
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 at linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg at linbit.com>
---
drivers/block/drbd/drbd_req.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 48d313d..7332198 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -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;
--
1.7.4.1
More information about the drbd-dev
mailing list