From patchwork Mon May 12 21:35:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 4161031 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 698059F334 for ; Mon, 12 May 2014 21:36:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7CB2D20304 for ; Mon, 12 May 2014 21:36:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F0FD2021B for ; Mon, 12 May 2014 21:36:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758382AbaELVgM (ORCPT ); Mon, 12 May 2014 17:36:12 -0400 Received: from mail-pb0-f50.google.com ([209.85.160.50]:64668 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751143AbaELVgJ (ORCPT ); Mon, 12 May 2014 17:36:09 -0400 Received: by mail-pb0-f50.google.com with SMTP id ma3so121138pbc.9 for ; Mon, 12 May 2014 14:36:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GyCb+HI9jy2tiNjB6Xyb61Ej2xL/QZnM1aHWAYSPurs=; b=EeANMgzhwNcQi+WC6EKqcLCZmnMkyJZ7Dz/KvPqGko7E9Dmjl1rN+NpREvuXcyQtFj 4nOoPk5yntJraxZk6NvBMpar2lCKVlDy3IYWJ1N76tO1v76gb6VWrK5bntQxgoIp3bfZ s+VTtCUq4pbegThJo+31nqUBRoeu7kqHsBilukiA0shwmD+5hmJGbBk2gQmmfV+B1Hxd vkt4TCjkz1g6UBVIzBpB2laWF/VI5GljBY9j050B0XYMzttC+37y0nOD/+vPmETaJKfK b9zmtixWQQGeJEDrqCPnxWaerzJJj+TSHs0VScIjaLRMWD1Uv3a9V1rUn5/bjBbdXE8i Bazw== X-Gm-Message-State: ALoCoQkvuqMYOE70YnSBUItwjijTMPhhrpTltrDUSNiq13cDKf8FhoYsVnB5JZWmcr2TpeWgacBg X-Received: by 10.69.26.70 with SMTP id iw6mr681060pbd.98.1399930568375; Mon, 12 May 2014 14:36:08 -0700 (PDT) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id xk3sm24518668pbb.65.2014.05.12.14.36.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 May 2014 14:36:07 -0700 (PDT) X-Google-Original-From: Thomas Haynes From: Thomas Haynes To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Tom Haynes Subject: [PATCH] Push the file layout driver into a subdirectory Date: Mon, 12 May 2014 14:35:52 -0700 Message-Id: <1399930552-20890-1-git-send-email-Thomas.Haynes@primarydata.com> X-Mailer: git-send-email 1.9.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tom Haynes The object and block layouts already exist in their own subdirectories. This patch completes the set! Note that as a layout denotes nfs4 already, I stripped that prefix out of the file names. Signed-off-by: Tom Haynes Acked-by: Jeff Layton --- fs/nfs/Makefile | 4 +--- fs/nfs/filelayout/Makefile | 5 +++++ fs/nfs/{nfs4filelayout.c => filelayout/filelayout.c} | 10 +++++----- fs/nfs/{nfs4filelayout.h => filelayout/filelayout.h} | 2 +- fs/nfs/{nfs4filelayoutdev.c => filelayout/filelayoutdev.c} | 6 +++--- 5 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 fs/nfs/filelayout/Makefile rename fs/nfs/{nfs4filelayout.c => filelayout/filelayout.c} (99%) rename fs/nfs/{nfs4filelayout.h => filelayout/filelayout.h} (99%) rename fs/nfs/{nfs4filelayoutdev.c => filelayout/filelayoutdev.c} (99%) diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile index 551d82a..43058f7 100644 --- a/fs/nfs/Makefile +++ b/fs/nfs/Makefile @@ -29,8 +29,6 @@ nfsv4-$(CONFIG_NFS_USE_LEGACY_DNS) += cache_lib.o nfsv4-$(CONFIG_SYSCTL) += nfs4sysctl.o nfsv4-$(CONFIG_NFS_V4_1) += pnfs.o pnfs_dev.o -obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o -nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o - +obj-$(CONFIG_PNFS_FILE_LAYOUT) += filelayout/ obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayout/ obj-$(CONFIG_PNFS_BLOCK) += blocklayout/ diff --git a/fs/nfs/filelayout/Makefile b/fs/nfs/filelayout/Makefile new file mode 100644 index 0000000..8516cdf --- /dev/null +++ b/fs/nfs/filelayout/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the pNFS Files Layout Driver kernel module +# +obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o +nfs_layout_nfsv41_files-y := filelayout.o filelayoutdev.o diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/filelayout/filelayout.c similarity index 99% rename from fs/nfs/nfs4filelayout.c rename to fs/nfs/filelayout/filelayout.c index 7954e16..ffc2ed8 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -35,11 +35,11 @@ #include -#include "nfs4session.h" -#include "internal.h" -#include "delegation.h" -#include "nfs4filelayout.h" -#include "nfs4trace.h" +#include "../nfs4session.h" +#include "../internal.h" +#include "../delegation.h" +#include "filelayout.h" +#include "../nfs4trace.h" #define NFSDBG_FACILITY NFSDBG_PNFS_LD diff --git a/fs/nfs/nfs4filelayout.h b/fs/nfs/filelayout/filelayout.h similarity index 99% rename from fs/nfs/nfs4filelayout.h rename to fs/nfs/filelayout/filelayout.h index cebd20e..ffbddf2 100644 --- a/fs/nfs/nfs4filelayout.h +++ b/fs/nfs/filelayout/filelayout.h @@ -30,7 +30,7 @@ #ifndef FS_NFS_NFS4FILELAYOUT_H #define FS_NFS_NFS4FILELAYOUT_H -#include "pnfs.h" +#include "../pnfs.h" /* * Default data server connection timeout and retrans vaules. diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c similarity index 99% rename from fs/nfs/nfs4filelayoutdev.c rename to fs/nfs/filelayout/filelayoutdev.c index efac602..7c85390 100644 --- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/filelayout/filelayoutdev.c @@ -33,9 +33,9 @@ #include #include -#include "internal.h" -#include "nfs4session.h" -#include "nfs4filelayout.h" +#include "../internal.h" +#include "../nfs4session.h" +#include "filelayout.h" #define NFSDBG_FACILITY NFSDBG_PNFS_LD