From: Thomas Haynes <thomas.haynes@primarydata.com>
To: linux-nfs@vger.kernel.org
Cc: Tom Haynes <Thomas.Haynes@primarydata.com>
Subject: [PATCH] Push the file layout driver into a subdirectory
Date: Fri, 9 May 2014 09:02:43 -0700 [thread overview]
Message-ID: <1399651363-14482-1-git-send-email-Thomas.Haynes@primarydata.com> (raw)
From: Tom Haynes <Thomas.Haynes@primarydata.com>
Went to the Makefile as requested by Jeff.
Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
---
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 <linux/sunrpc/metrics.h>
-#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 <linux/module.h>
#include <linux/sunrpc/addr.h>
-#include "internal.h"
-#include "nfs4session.h"
-#include "nfs4filelayout.h"
+#include "../internal.h"
+#include "../nfs4session.h"
+#include "filelayout.h"
#define NFSDBG_FACILITY NFSDBG_PNFS_LD
--
1.9.0
next reply other threads:[~2014-05-09 16:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 16:02 Thomas Haynes [this message]
2014-05-09 16:35 ` [PATCH] Push the file layout driver into a subdirectory Jeff Layton
-- strict thread matches above, loose matches on Subject: below --
2014-05-12 21:35 Thomas Haynes
2014-05-08 21:31 Thomas Haynes
2014-05-08 23:10 ` Jeff Layton
2014-05-08 14:48 Thomas Haynes
2014-05-08 17:43 ` Jeff Layton
[not found] ` <1582D06D-6663-49EC-A187-BF52FBCFAC39@primarydata.com>
2014-05-08 21:06 ` Jeff Layton
2014-05-08 21:38 ` Tom Haynes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399651363-14482-1-git-send-email-Thomas.Haynes@primarydata.com \
--to=thomas.haynes@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).