linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Push the file layout driver into a subdirectory
@ 2014-05-08 14:48 Thomas Haynes
  2014-05-08 17:43 ` Jeff Layton
  0 siblings, 1 reply; 9+ messages in thread
From: Thomas Haynes @ 2014-05-08 14:48 UTC (permalink / raw)
  To: linux-nfs; +Cc: Tom Haynes

From: Tom Haynes <Thomas.Haynes@primarydata.com>

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.

The patch looks longer than it really is, but git
logs are preserved. :-)

Tom Haynes (1):
  Push the file layout driver into a subdirectory

 fs/nfs/Makefile                   |    4 +-
 fs/nfs/filelayout/Kbuild          |    5 +
 fs/nfs/filelayout/filelayout.c    | 1391 +++++++++++++++++++++++++++++++++++++
 fs/nfs/filelayout/filelayout.h    |  156 +++++
 fs/nfs/filelayout/filelayoutdev.c |  843 ++++++++++++++++++++++
 fs/nfs/nfs4filelayout.c           | 1391 -------------------------------------
 fs/nfs/nfs4filelayout.h           |  156 -----
 fs/nfs/nfs4filelayoutdev.c        |  843 ----------------------
 8 files changed, 2396 insertions(+), 2393 deletions(-)
 create mode 100644 fs/nfs/filelayout/Kbuild
 create mode 100644 fs/nfs/filelayout/filelayout.c
 create mode 100644 fs/nfs/filelayout/filelayout.h
 create mode 100644 fs/nfs/filelayout/filelayoutdev.c
 delete mode 100644 fs/nfs/nfs4filelayout.c
 delete mode 100644 fs/nfs/nfs4filelayout.h
 delete mode 100644 fs/nfs/nfs4filelayoutdev.c

-- 
1.9.0


^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] Push the file layout driver into a subdirectory
@ 2014-05-08 21:31 Thomas Haynes
  2014-05-08 23:10 ` Jeff Layton
  0 siblings, 1 reply; 9+ messages in thread
From: Thomas Haynes @ 2014-05-08 21:31 UTC (permalink / raw)
  To: linux-nfs; +Cc: Tom Haynes

From: Tom Haynes <Thomas.Haynes@primarydata.com>

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 <Thomas.Haynes@primarydata.com>
---
 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 <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


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH] Push the file layout driver into a subdirectory
@ 2014-05-09 16:02 Thomas Haynes
  2014-05-09 16:35 ` Jeff Layton
  0 siblings, 1 reply; 9+ messages in thread
From: Thomas Haynes @ 2014-05-09 16:02 UTC (permalink / raw)
  To: linux-nfs; +Cc: Tom Haynes

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


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH] Push the file layout driver into a subdirectory
@ 2014-05-12 21:35 Thomas Haynes
  0 siblings, 0 replies; 9+ messages in thread
From: Thomas Haynes @ 2014-05-12 21:35 UTC (permalink / raw)
  To: trond.myklebust; +Cc: linux-nfs, Tom Haynes

From: Tom Haynes <Thomas.Haynes@primarydata.com>

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 <Thomas.Haynes@primarydata.com>
Acked-by: Jeff Layton <jlayton@poochiereds.net>
---
 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


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-05-12 21:36 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-08 14:48 [PATCH] Push the file layout driver into a subdirectory 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
  -- strict thread matches above, loose matches on Subject: below --
2014-05-08 21:31 Thomas Haynes
2014-05-08 23:10 ` Jeff Layton
2014-05-09 16:02 Thomas Haynes
2014-05-09 16:35 ` Jeff Layton
2014-05-12 21:35 Thomas Haynes

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).