Skip to contentSkip to conversation

Push the file layout driver into a subdirectory

PATCH In review Thomas Haynes 2 participants 2 messages May 8, 2014

Subsystems (2)
NFS client NFS server
lore
Share & tools
lore

Thomas Haynes

author
#0 lore raw

PATCH 1/1 Push the file layout driver into a subdirectory

From: Tom Haynes <[email protected]>

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 <[email protected]>
---
 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%)
fs/nfs/Makefile +1 -3
index 551d82a..43058f7 100644
@@ -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/
fs/nfs/filelayout/Kbuild new file +5 -0
new file mode 100644
index 0000000..8516cdf
@@ -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
fs/nfs/filelayout/filelayout.c renamed from fs/nfs/nfs4filelayout.c +5 -5
similarity index 99%
rename from fs/nfs/nfs4filelayout.c
rename to fs/nfs/filelayout/filelayout.c
index 7954e16..ffc2ed8 100644
@@ -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
fs/nfs/filelayout/filelayout.h renamed from fs/nfs/nfs4filelayout.h +1 -1
similarity index 99%
rename from fs/nfs/nfs4filelayout.h
rename to fs/nfs/filelayout/filelayout.h
index cebd20e..ffbddf2 100644
@@ -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.
fs/nfs/filelayout/filelayoutdev.c renamed from fs/nfs/nfs4filelayoutdev.c +3 -3
similarity index 99%
rename from fs/nfs/nfs4filelayoutdev.c
rename to fs/nfs/filelayout/filelayoutdev.c
index efac602..7c85390 100644
@@ -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
Signature · 1 line
1.9.0
Acked-by on v1 1/1
#1 lore raw

fs/nfs/filelayout/Kbuild

Quoted 36 lines · On Thu, 8 May 2014 14:31:02 -0700 Thomas Haynes…

From: Tom Haynes <[email protected]>

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 <[email protected]>
---
 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%)
fs/nfs/Makefile +1 -3
index 551d82a..43058f7 100644
@@ -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/
fs/nfs/filelayout/Kbuild +0 -0

nit: supposedly the preferred name for these files is "Makefile", though the objayout driver does seem to use "Kbuild". Probably best to change that here since you're renaming files anyway...

Quoted 60 lines

new file mode 100644
index 0000000..8516cdf

fs/nfs/filelayout/Kbuild new file +5 -0
@@ -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
fs/nfs/filelayout/filelayout.c renamed from fs/nfs/nfs4filelayout.c +5 -5
similarity index 99%
rename from fs/nfs/nfs4filelayout.c
rename to fs/nfs/filelayout/filelayout.c
index 7954e16..ffc2ed8 100644
@@ -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
fs/nfs/filelayout/filelayout.h renamed from fs/nfs/nfs4filelayout.h +1 -1
similarity index 99%
rename from fs/nfs/nfs4filelayout.h
rename to fs/nfs/filelayout/filelayout.h
index cebd20e..ffbddf2 100644
@@ -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.
fs/nfs/filelayout/filelayoutdev.c renamed from fs/nfs/nfs4filelayoutdev.c +0 -0
similarity index 99%
rename from fs/nfs/nfs4filelayoutdev.c
rename to fs/nfs/filelayout/filelayoutdev.c
index efac602..7c85390 100644
@@ -33,9 +33,9 @@
 #include <linux/module.h>
 #include <linux/sunrpc/addr.h>

fs/nfs/filelayout/filelayoutdev.c line 41

Quoted 10 lines
fs/nfs/filelayout/filelayoutdev.c renamed from fs/nfs/nfs4filelayoutdev.c +3 -3
 
-#include "internal.h"
-#include "nfs4session.h"
-#include "nfs4filelayout.h"
+#include "../internal.h"
+#include "../nfs4session.h"
+#include "filelayout.h"
 
 #define NFSDBG_FACILITY		NFSDBG_PNFS_LD

Looks good to me. Nice cleanup.

Acked-by Jeff Layton <[email protected]>