tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <Thomas.Haynes@primarydata.com>
Acked-by: Jeff Layton <jlayton@poochiereds.net>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

authored by

Tom Haynes and committed by
Trond Myklebust b5968725 0aa61e78

+15 -12
+1 -3
fs/nfs/Makefile
··· 29 29 nfsv4-$(CONFIG_SYSCTL) += nfs4sysctl.o 30 30 nfsv4-$(CONFIG_NFS_V4_1) += pnfs.o pnfs_dev.o 31 31 32 - obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o 33 - nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o 34 - 32 + obj-$(CONFIG_PNFS_FILE_LAYOUT) += filelayout/ 35 33 obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayout/ 36 34 obj-$(CONFIG_PNFS_BLOCK) += blocklayout/
+5
fs/nfs/filelayout/Makefile
··· 1 + # 2 + # Makefile for the pNFS Files Layout Driver kernel module 3 + # 4 + obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o 5 + nfs_layout_nfsv41_files-y := filelayout.o filelayoutdev.o
+5 -5
fs/nfs/nfs4filelayout.c fs/nfs/filelayout/filelayout.c
··· 35 35 36 36 #include <linux/sunrpc/metrics.h> 37 37 38 - #include "nfs4session.h" 39 - #include "internal.h" 40 - #include "delegation.h" 41 - #include "nfs4filelayout.h" 42 - #include "nfs4trace.h" 38 + #include "../nfs4session.h" 39 + #include "../internal.h" 40 + #include "../delegation.h" 41 + #include "filelayout.h" 42 + #include "../nfs4trace.h" 43 43 44 44 #define NFSDBG_FACILITY NFSDBG_PNFS_LD 45 45
+1 -1
fs/nfs/nfs4filelayout.h fs/nfs/filelayout/filelayout.h
··· 30 30 #ifndef FS_NFS_NFS4FILELAYOUT_H 31 31 #define FS_NFS_NFS4FILELAYOUT_H 32 32 33 - #include "pnfs.h" 33 + #include "../pnfs.h" 34 34 35 35 /* 36 36 * Default data server connection timeout and retrans vaules.
+3 -3
fs/nfs/nfs4filelayoutdev.c fs/nfs/filelayout/filelayoutdev.c
··· 33 33 #include <linux/module.h> 34 34 #include <linux/sunrpc/addr.h> 35 35 36 - #include "internal.h" 37 - #include "nfs4session.h" 38 - #include "nfs4filelayout.h" 36 + #include "../internal.h" 37 + #include "../nfs4session.h" 38 + #include "filelayout.h" 39 39 40 40 #define NFSDBG_FACILITY NFSDBG_PNFS_LD 41 41