From patchwork Thu May 8 21:31:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 4138961 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6B890BFF02 for ; Thu, 8 May 2014 21:31:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B727B201F9 for ; Thu, 8 May 2014 21:31:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA510201ED for ; Thu, 8 May 2014 21:31:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754993AbaEHVbN (ORCPT ); Thu, 8 May 2014 17:31:13 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:44777 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754809AbaEHVbN (ORCPT ); Thu, 8 May 2014 17:31:13 -0400 Received: by mail-pd0-f178.google.com with SMTP id r10so2818686pdi.9 for ; Thu, 08 May 2014 14:31:12 -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=LDcWwtDUyFHLudrWgBQBLWM/qZ3lDTamo65rgKOdc0I=; b=YWGFOthv2i0RRUZSxEU+v5d4ritpaLuz+hkPatv/bPuEtDHjUPXVXrf/VlAyhp6tqI OH99P9cmWoIZql/H2LKSCk2Z/yr8/+6rUmUcx+E0WdjW2ags9pRnbG9spg79SjhzG3e6 34q01l8Omn5GwTHL684eB87UoznB4cAKNZWCI/ArBzPAwrIYG5eU/rGu4MpoPPr89PA6 4egK650d8OVmdDZmRH/iFz/x4jfc/on6K6VppoRrVwuqkpg3KAcP2rRwuZpmXtUp8rOd GHSQXS7cIxs6OagDfXTHOwldt7lnFuh3fnAB6zpbT+luzFoGK7FsjHJgDTdqxQITMtnt aYKQ== X-Gm-Message-State: ALoCoQlR3fkFh4ewIcoRjVPQdPm2RCS+9rNnqqbj4cN+4QIIcOVOjOOCVnpUXSIa7Oaog9wTbNH8 X-Received: by 10.66.65.204 with SMTP id z12mr12288276pas.60.1399584672861; Thu, 08 May 2014 14:31:12 -0700 (PDT) Received: from localhost.localdomain (c-76-126-118-221.hsd1.ca.comcast.net. [76.126.118.221]) by mx.google.com with ESMTPSA id f2sm9265429pat.11.2014.05.08.14.31.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 May 2014 14:31:12 -0700 (PDT) X-Google-Original-From: Thomas Haynes From: Thomas Haynes To: linux-nfs@vger.kernel.org Cc: Tom Haynes Subject: [PATCH] Push the file layout driver into a subdirectory Date: Thu, 8 May 2014 14:31:02 -0700 Message-Id: <1399584662-1913-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/Kbuild | 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/Kbuild 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/Kbuild b/fs/nfs/filelayout/Kbuild new file mode 100644 index 0000000..8516cdf --- /dev/null +++ b/fs/nfs/filelayout/Kbuild @@ -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