From 17532d94b73170946d4ca24ab4ed60b2d911dfe8 Mon Sep 17 00:00:00 2001 From: Johann Lombardi Date: Mon, 2 Aug 2010 09:49:53 +0200 Subject: [PATCH] Revert "b=23139 give the required grant for reconnection" This reverts commit 307f1ef16b4f32b9deeefff4b0aa5a1f0f0d2efa. Revert patch from bug 23139 since it causes build failure on i686 and it also contains a bogus LASSERT. --- lustre/obdfilter/filter_io.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c index 28c828e..7b5332b 100644 --- a/lustre/obdfilter/filter_io.c +++ b/lustre/obdfilter/filter_io.c @@ -226,8 +226,7 @@ long filter_grant(struct obd_export *exp, obd_size current_grant, obd->obd_name, exp->exp_client_uuid.uuid, exp, want); } else if (current_grant < want && current_grant < fed->fed_grant + FILTER_GRANT_CHUNK) { - grant = min(want + (1 << blockbits) - 1, - fs_space_left / (conservative ? 8 : 1)); + grant = min(want + (1 << blockbits) - 1, fs_space_left / 8); grant &= ~((1ULL << blockbits) - 1); if (grant) { @@ -245,11 +244,6 @@ long filter_grant(struct obd_export *exp, obd_size current_grant, LBUG(); } } - - LASSERTF(conservative || (fed->fed_grant >= want), "can't get " - "enough grant (want = "LPU64", fs_space_left = "LPU64 - ", gotten = %ld)\n", - want, fs_space_left, fed->fed_grant); } CDEBUG(D_CACHE, -- 1.8.3.1