From 588484d7edcc4853ddde78a4bb4b753aced047aa Mon Sep 17 00:00:00 2001
From: Suresh Jayaraman <sjayaraman@suse.com>
Date: Wed, 12 Oct 2011 11:52:01 +0530
Subject: [PATCH] --- yaml --- r: 269947 b: refs/heads/master c:
 c9c4708fdf63d26e3fdfc65bba9e82e654cae285 h: refs/heads/master i:   269945:
 a0729688e1b0789b4719710e1fc0ffe150d6eecc   269943:
 387919ee88e718c715a1772192095032c5c2aac7 v: v3

---
 [refs]               |  2 +-
 trunk/fs/cifs/README | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 184372a91aa6..a95751d3548e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e75047344ea415760b2508a6fa29c0288c7b6b68
+refs/heads/master: c9c4708fdf63d26e3fdfc65bba9e82e654cae285
diff --git a/trunk/fs/cifs/README b/trunk/fs/cifs/README
index c5c2c5e5f0f2..95b37a1d58f2 100644
--- a/trunk/fs/cifs/README
+++ b/trunk/fs/cifs/README
@@ -745,4 +745,18 @@ installed and something like the following lines should be added to the
 create cifs.spnego * * /usr/local/sbin/cifs.upcall %k
 create dns_resolver * * /usr/local/sbin/cifs.upcall %k
 
+CIFS kernel module parameters
+=============================
+These module parameters can be specified or modified either during the time of
+module loading or during the runtime by using the interface
+	/proc/module/cifs/parameters/<param>
+
+i.e. echo "value" > /proc/module/cifs/parameters/<param>
+
+1. echo_retries - The number of echo attempts before giving up and
+		  reconnecting to the server. The default is 5. The value 0
+		  means never reconnect.
+
+2. enable_oplocks - Enable or disable oplocks. Oplocks are enabled by default.
+		    [Y/y/1]. To disable use any of [N/n/0].