From 4d2a6314fb6d892e68dcd4cd1383a75f12e78dfd Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@gmail.com>
Date: Wed, 10 Aug 2011 18:29:21 -0400
Subject: [PATCH] --- yaml --- r: 262733 b: refs/heads/master c:
 54a33b190aa5386dd214b4ad02986445e20e83d1 h: refs/heads/master i:   262731:
 b25dc385d026b8175dd34744a6220679de769e36 v: v3

---
 [refs]               |  2 +-
 trunk/fs/nfs/Kconfig | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index faddb07fc21e..348e91994b76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 068ef739127af1faf6f342b56d41ceea89f76c75
+refs/heads/master: 54a33b190aa5386dd214b4ad02986445e20e83d1
diff --git a/trunk/fs/nfs/Kconfig b/trunk/fs/nfs/Kconfig
index be020771c6b4..0d306131706d 100644
--- a/trunk/fs/nfs/Kconfig
+++ b/trunk/fs/nfs/Kconfig
@@ -79,12 +79,9 @@ config NFS_V4_1
 	depends on NFS_FS && NFS_V4 && EXPERIMENTAL
 	select SUNRPC_BACKCHANNEL
 	select PNFS_FILE_LAYOUT
-	select PNFS_BLOCK
-	select MD
-	select BLK_DEV_DM
 	help
 	  This option enables support for minor version 1 of the NFSv4 protocol
-	  (RFC 5661 and RFC 5663) in the kernel's NFS client.
+	  (RFC 5661) in the kernel's NFS client.
 
 	  If unsure, say N.
 
@@ -92,7 +89,14 @@ config PNFS_FILE_LAYOUT
 	tristate
 
 config PNFS_BLOCK
-	tristate
+	tristate "Provide support for the pNFS Block Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)"
+	depends on NFS_FS && NFS_V4_1 && BLK_DEV_DM
+	help
+	  Say M here if you want your pNFS client to support the Block Layout Driver
+	  (RFC 5663). Requires Multiple devices driver support (DM) and Device mapper
+	  support (BLK_DEV_DM).
+
+	  If unsure, say N.
 
 config PNFS_OBJLAYOUT
 	tristate "Provide support for the pNFS Objects Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)"