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

Commit 9c69de4c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

nfsd: remove <linux/nfsd/nfsfh.h> 



The only real user of this header is fs/nfsd/nfsfh.h, so merge the
two.  Various lockѕ source files used it to indirectly get other
sunrpc or nfs headers, so fix those up.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 4dd86e15

fs/lockd/clnt4xdr.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/sunrpc/stats.h>

#include <linux/lockd/lockd.h>



#include <uapi/linux/nfs3.h>



#define NLMDBG_FACILITY		NLMDBG_XDR



#if (NLMCLNT_OHSIZE > XDR_MAX_NETOBJ)

fs/lockd/clntxdr.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <linux/sunrpc/stats.h>

#include <linux/lockd/lockd.h>



#include <uapi/linux/nfs2.h>



#define NLMDBG_FACILITY		NLMDBG_XDR



#if (NLMCLNT_OHSIZE > XDR_MAX_NETOBJ)

fs/lockd/svcsubs.c

+1 −1
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
#include <linux/mutex.h>

#include <linux/sunrpc/svc.h>

#include <linux/sunrpc/addr.h>

#include <linux/nfsd/nfsfh.h>

#include <linux/nfsd/export.h>

#include <linux/lockd/lockd.h>

#include <linux/lockd/share.h>

#include <linux/module.h>

#include <linux/mount.h>

#include <uapi/linux/nfs2.h>



#define NLMDBG_FACILITY		NLMDBG_SVCSUBS

fs/lockd/xdr.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/sunrpc/stats.h>

#include <linux/lockd/lockd.h>



#include <uapi/linux/nfs2.h>



#define NLMDBG_FACILITY		NLMDBG_XDR

fs/nfsd/nfsd.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/nfs2.h>

#include <linux/nfs3.h>

#include <linux/nfs4.h>

#include <linux/sunrpc/svc.h>

#include <linux/sunrpc/msg_prot.h>



#include <linux/nfsd/debug.h>