From patchwork Thu Aug 11 22:26:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 1059152 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7BMQup3032724 for ; Thu, 11 Aug 2011 22:26:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753624Ab1HKW0z (ORCPT ); Thu, 11 Aug 2011 18:26:55 -0400 Received: from natasha.panasas.com ([67.152.220.90]:37522 "EHLO natasha.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753606Ab1HKW0z (ORCPT ); Thu, 11 Aug 2011 18:26:55 -0400 Received: from zenyatta.panasas.com (zenyatta.int.panasas.com [172.17.28.63]) by natasha.panasas.com (8.13.1/8.13.1) with ESMTP id p7BMQror006371; Thu, 11 Aug 2011 18:26:53 -0400 Received: from [172.17.132.75] (172.17.132.75) by zenyatta.int.panasas.com (172.17.28.63) with Microsoft SMTP Server (TLS) id 14.1.289.1; Thu, 11 Aug 2011 18:26:48 -0400 Message-ID: <4E445726.1000702@panasas.com> Date: Thu, 11 Aug 2011 15:26:46 -0700 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20110707 Thunderbird/5.0 MIME-Version: 1.0 To: Benny Halevy , NFS list Subject: Bad extra hunk at pan_layout driver pathes Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 11 Aug 2011 22:26:56 +0000 (UTC) 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 > diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig > index be02077..4f42384 100644 > --- a/fs/nfs/Kconfig > +++ b/fs/nfs/Kconfig > @@ -104,6 +104,24 @@ config PNFS_OBJLAYOUT > > 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 > +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 > 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 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 --- fs/nfs/Kconfig | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index ad5aed0..26448dc 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -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 - 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