From b8968118f3705480311927ba7995e0f333423b28 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 10 May 2010 16:03:10 +0200 Subject: [PATCH] --- yaml --- r: 213099 b: refs/heads/master c: 905cd7d8ac9b18e1f122b90dbebe1246b1c364fd h: refs/heads/master i: 213097: 18da480ef732509e1133a2090dd53729668aa61d 213095: 6e76ff4f38b3c21ebf90a2ef9debb1defcffe36c v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index bd9a37650444..773e5915cb2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ba82308ea766b33404cb130a88fe4113d9c20a3 +refs/heads/master: 905cd7d8ac9b18e1f122b90dbebe1246b1c364fd diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index 39c2cc3614e4..48647589aa0d 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -984,21 +984,6 @@ static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write) return 1; } - /* - * Paranoia: we might have been primary, but sync target, or - * even diskless, then lost the connection. - * This should have been handled (panic? suspend?) somewhere - * else. But maybe it was not, so check again here. - * Caution: as long as we do not have a read/write lock on mdev, - * to serialize state changes, this is racy, since we may lose - * the connection *after* we test for the cstate. - */ - if (mdev->state.disk < D_UP_TO_DATE && mdev->state.pdsk < D_UP_TO_DATE) { - if (__ratelimit(&drbd_ratelimit_state)) - dev_err(DEV, "Sorry, I have no access to good data anymore.\n"); - return 1; - } - return 0; }