Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5968725 authored by Tom Haynes's avatar Tom Haynes Committed by Trond Myklebust
Browse files

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: default avatarTom Haynes <Thomas.Haynes@primarydata.com>
Acked-by: default avatarJeff Layton <jlayton@poochiereds.net>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 0aa61e78

fs/nfs/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -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/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#

# 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/nfs4filelayout.c→fs/nfs/filelayout/filelayout.c

+5 −5
Original line number Diff line number Diff line
@@ -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/nfs4filelayout.h→fs/nfs/filelayout/filelayout.h

+1 −1
Original line number Diff line number Diff line
@@ -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/nfs4filelayoutdev.c→fs/nfs/filelayout/filelayoutdev.c

+3 −3
Original line number Diff line number Diff line
@@ -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