From a27d2ba9829d092f64076231629ba9bd576facbf Mon Sep 17 00:00:00 2001 From: Tom Haynes Date: Mon, 12 May 2014 14:35:52 -0700 Subject: [PATCH] Push the file layout driver into a subdirectory 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 Signed-off-by: Trond Myklebust --- 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 +- .../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 03192a66c143..4782e0840dcc 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 000000000000..8516cdffb9e9 --- /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 63a16375660a..7d479fd3ca85 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 cebd20e7e923..ffbddf2219ea 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 efac602edb37..7c85390a4647 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 -- 2.39.5