b=10894

[fs/lustre-release.git] / lustre / mds / handler.c

diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 5f59ab3..8cc1aba 100644 (file)
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -2053,7 +2053,8 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf)
                               obd->obd_replayable ? "enabled" : "disabled");
         }
 
-        ldlm_timeout = 6;
+        if (ldlm_timeout == LDLM_TIMEOUT_DEFAULT)
+                ldlm_timeout = 6;
 
         RETURN(0);