From: Johann Lombardi <johann.lombardi@oracle.com>
Date: Mon, 2 Aug 2010 07:49:53 +0000 (+0200)
Subject: Revert "b=23139 give the required grant for reconnection"
X-Git-Tag: v1_8_4_50~21
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=17532d94b73170946d4ca24ab4ed60b2d911dfe8;p=fs%2Flustre-release.git

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.
---

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,