Commit cb12fae1 authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever
Browse files

nfsd: move nfserrno() to vfs.c 



nfserrno() is common to all nfs versions, but nfsproc.c is specifically
for NFSv2. Move it to vfs.c, and the prototype to vfs.h.

While we're in here, remove the #ifdef EDQUOT check in this function.
It's apparently a holdover from the initial merge of the nfsd code in
1997. No other place in the kernel checks that that symbol is defined
before using it, so I think we can dispense with it here.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 8e823baf

fs/nfsd/blocklayout.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "blocklayoutxdr.h"

#include "pnfs.h"

#include "filecache.h"

#include "vfs.h"



#define NFSDDBG_FACILITY	NFSDDBG_PNFS

fs/nfsd/blocklayoutxdr.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include "nfsd.h"

#include "blocklayoutxdr.h"

#include "vfs.h"



#define NFSDDBG_FACILITY	NFSDDBG_PNFS

fs/nfsd/export.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ struct svc_export * rqst_find_fsidzero_export(struct svc_rqst *); 
int			exp_rootfh(struct net *, struct auth_domain *,

					char *path, struct knfsd_fh *, int maxsize);

__be32			exp_pseudoroot(struct svc_rqst *, struct svc_fh *);

__be32			nfserrno(int errno);



static inline void exp_put(struct svc_export *exp)

{

fs/nfsd/flexfilelayout.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include "flexfilelayoutxdr.h"

#include "pnfs.h"

#include "vfs.h"



#define NFSDDBG_FACILITY	NFSDDBG_PNFS

fs/nfsd/nfs4idmap.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "idmap.h"

#include "nfsd.h"

#include "netns.h"

#include "vfs.h"



/*

 * Turn off idmapping when using AUTH_SYS.