Skip to contentSkip to conversation

Bad extra hunk at pan_layout driver pathes

DISCUSSION Boaz Harrosh 2 participants 2 messages Aug 11, 2011 – Aug 12, 2011

Subsystems (2)
NFS client NFS server
lore
Share & tools
lore

Boaz Harrosh

author
#0 lore raw

Hi Benny

In your pNFS git tree at patch:
99432a3 pnfs-obj: panlayout: panfs_shim objects IO engine

There is an extra hunk at Kconfig re-adding the PNFS_BLOCKS See below

Quoted 6 lines
fs/nfs/Kconfig +0 -0
index be02077..4f42384 100644
@@ -104,6 +104,24 @@ config PNFS_OBJLAYOUT

fs/nfs/Kconfig config PNFS_OBJLAYOUT · line 114

Quoted 10 lines
fs/nfs/Kconfig +8 -0
 	  If unsure, say N.
 
+config PNFS_PANLAYOUT
+	tristate "Provide support for the Panasas OSD Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)"
+	depends on PNFS_OBJLAYOUT
+	help
+	  Say M or y here if you want your pNFS client to support the Panasas OSD Layout Driver.
+
+	  If unsure, say N.
+

vvvvv Below is not needed

fs/nfs/Kconfig config PNFS_OBJLAYOUT · line 124

Quoted 10 lines
fs/nfs/Kconfig +10 -0
+config PNFS_BLOCK
+	tristate "Provide a pNFS block client (EXPERIMENTAL)"
+	depends on NFS_FS && NFS_V4_1
+	select MD
+	select BLK_DEV_DM
+	help
+	  Say M or y here if you want your pNfs client to support the block protocol
+
+	  If unsure, say N.
+

Please remove it below is a reverting diff

Thanks

fs/nfs/Kconfig config PNFS_OBJLAYOUT · line 127

Quoted 3 lines
fs/nfs/Kconfig +0 -0
 config ROOT_NFS
 	bool "Root file system on NFS"
 	depends on NFS_FS=y && IP_PNP

---

#1 lore raw
Quoted 68 lines · Boaz Harrosh

Hi Benny

In your pNFS git tree at patch:
99432a3 pnfs-obj: panlayout: panfs_shim objects IO engine

There is an extra hunk at Kconfig re-adding the PNFS_BLOCKS See below

Quoted 6 lines
fs/nfs/Kconfig +0 -0
index be02077..4f42384 100644
@@ -104,6 +104,24 @@ config PNFS_OBJLAYOUT

fs/nfs/Kconfig config PNFS_OBJLAYOUT · line 114

Quoted 10 lines
fs/nfs/Kconfig +8 -0
 	  If unsure, say N.
 
+config PNFS_PANLAYOUT
+	tristate "Provide support for the Panasas OSD Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)"
+	depends on PNFS_OBJLAYOUT
+	help
+	  Say M or y here if you want your pNFS client to support the Panasas OSD Layout Driver.
+
+	  If unsure, say N.
+

vvvvv Below is not needed

fs/nfs/Kconfig config PNFS_OBJLAYOUT · line 124

Quoted 10 lines
fs/nfs/Kconfig +10 -0
+config PNFS_BLOCK
+	tristate "Provide a pNFS block client (EXPERIMENTAL)"
+	depends on NFS_FS && NFS_V4_1
+	select MD
+	select BLK_DEV_DM
+	help
+	  Say M or y here if you want your pNfs client to support the block protocol
+
+	  If unsure, say N.
+

Please remove it below is a reverting diff

Thanks

fs/nfs/Kconfig config PNFS_OBJLAYOUT · line 127

Quoted 3 lines
fs/nfs/Kconfig +0 -0
 config ROOT_NFS
 	bool "Root file system on NFS"
 	depends on NFS_FS=y && IP_PNP

---
From 5f183d5217b7714c848913f939c6d79b725e652b Mon Sep 17 00:00:00 2001
From: Boaz Harrosh <[email protected]>
Date: Thu, 11 Aug 2011 15:23:06 -0700
Subject: [PATCH] SQUASHME: pnfs-obj: panlayout: Remove a miss-merge in Kconfig

Looks like a rebase fallout

Signed-off-by Boaz Harrosh <[email protected]>
---
 fs/nfs/Kconfig |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
fs/nfs/Kconfig +0 -3
index ad5aed0..26448dc 100644
@@ -106,16 +106,6 @@ config PNFS_PANLAYOUT
 
 	  If unsure, say N.
 
-config PNFS_BLOCK
-	tristate "Provide a pNFS block client (EXPERIMENTAL)"
-	depends on NFS_FS && NFS_V4_1

fs/nfs/Kconfig config PNFS_PANLAYOUT · line 111

Quoted 10 lines
fs/nfs/Kconfig +0 -7
-	select MD
-	select BLK_DEV_DM
-	help
-	  Say M or y here if you want your pNfs client to support the block protocol
-
-	  If unsure, say N.
-
 config ROOT_NFS
 	bool "Root file system on NFS"
 	depends on NFS_FS=y && IP_PNP

Grr, sorry about that.
Fixed. Thanks for spotting!

Benny