Branch HEAD

b=19507
i=johann
HEAD port of original 1.8.1 patch.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 9962658..6c55f96 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -13,6 +13,12 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
        * File join has been disabled in this release, refer to Bugzilla 16929.
 
+
+Severity   : normal
+Bugzilla   : 19507
+Description: Temporarily disable grant shrink.
+Details    : Disable the feature for debugging.
+
 Severity   : normal 
 Bugzilla   : 18624 
 Description: Unable to run several mkfs.lustre on loop devices at the same

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index d99700e..491ae8f 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -343,7 +343,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt)
                                   OBD_CONNECT_SRVLOCK   | OBD_CONNECT_TRUNCLOCK|
                                   OBD_CONNECT_AT | OBD_CONNECT_RMT_CLIENT |
                                   OBD_CONNECT_OSS_CAPA | OBD_CONNECT_VBR|
-                                  OBD_CONNECT_GRANT_SHRINK | OBD_CONNECT_SOM;
+                                  OBD_CONNECT_SOM;
 
         if (!OBD_FAIL_CHECK(OBD_FAIL_OSC_CONNECT_CKSUM)) {
                 /* OBD_CONNECT_CKSUM should always be set, even if checksums are