b=19507

i=johann
disable grant_shrink (bz 12069)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d237721..a629932 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -85,15 +85,6 @@ Bugzilla   : 17536
 Description: MDS create should not wait for statfs RPC while holding DLM lock.
 
 Severity   : normal
-Frequency  : normal
-Bugzilla   : 12069
-Descriptoin: OST grant too much space to client even there are not enough space.
-Details    : Client will shrink its grant cache to OST if there are no write
-            activity over 6 mins (GRANT_SHRINK_INTERVAL), and OST will retrieve
-            this grant cache if there are already not enough avaible space
-            (left_space < total_clients * 32M).
-
-Severity   : normal
 Frequency  : rare, connect and disconnect target at same time
 Bugzilla   : 17310
 Descriptoin: ASSERTION(atomic_read(&imp->imp_inflight) == 0

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index e4b3342..d56a998 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -386,8 +386,7 @@ static int client_common_fill_super(struct super_block *sb,
                                   OBD_CONNECT_REQPORTAL | OBD_CONNECT_BRW_SIZE |
                                   OBD_CONNECT_SRVLOCK   | OBD_CONNECT_CANCELSET|
                                   OBD_CONNECT_AT        | OBD_CONNECT_FID      |
-                                  OBD_CONNECT_VBR       | OBD_CONNECT_TRUNCLOCK|
-                                  OBD_CONNECT_GRANT_SHRINK;
+                                  OBD_CONNECT_VBR       | OBD_CONNECT_TRUNCLOCK;
 
         if (!OBD_FAIL_CHECK(OBD_FAIL_OSC_CONNECT_CKSUM)) {
                 /* OBD_CONNECT_CKSUM should always be set, even if checksums are