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

Commit 40c64c26 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Move nfs_idmap.h into fs/nfs/ 



This file is only used internally to the NFS v4 module, so it doesn't
need to be in the global include path.  I also renamed it from
nfs_idmap.h to nfs4idmap.h to emphasize that it's an NFSv4-only include
file.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f9ebd618

fs/nfs/flexfilelayout/flexfilelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
#include <linux/module.h>



#include <linux/sunrpc/metrics.h>

#include <linux/nfs_idmap.h>



#include "flexfilelayout.h"

#include "../nfs4session.h"

#include "../nfs4idmap.h"

#include "../internal.h"

#include "../delegation.h"

#include "../nfs4trace.h"

fs/nfs/idmap.c

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

#include <linux/parser.h>

#include <linux/fs.h>

#include <linux/nfs_idmap.h>

#include <net/net_namespace.h>

#include <linux/sunrpc/rpc_pipe_fs.h>

#include <linux/nfs_fs.h>
@@ -49,6 +48,7 @@ 


#include "internal.h"

#include "netns.h"

#include "nfs4idmap.h"

#include "nfs4trace.h"



#define NFS_UINT_MAXLEN 11

fs/nfs/nfs4client.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 */

#include <linux/module.h>

#include <linux/nfs_fs.h>

#include <linux/nfs_idmap.h>

#include <linux/nfs_mount.h>

#include <linux/sunrpc/addr.h>

#include <linux/sunrpc/auth.h>
@@ -15,6 +14,7 @@ 
#include "callback.h"

#include "delegation.h"

#include "nfs4session.h"

#include "nfs4idmap.h"

#include "pnfs.h"

#include "netns.h"

include/linux/nfs_idmap.h→fs/nfs/nfs4idmap.h

+1 −1
Original line number Diff line number Diff line 
/*

 * include/linux/nfs_idmap.h

 * fs/nfs/nfs4idmap.h

 *

 *  UID and GID to name mapping for clients.

 *

fs/nfs/nfs4proc.c

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

#include <linux/mount.h>

#include <linux/module.h>

#include <linux/nfs_idmap.h>

#include <linux/xattr.h>

#include <linux/utsname.h>

#include <linux/freezer.h>
@@ -63,6 +62,7 @@ 
#include "callback.h"

#include "pnfs.h"

#include "netns.h"

#include "nfs4idmap.h"

#include "nfs4session.h"

#include "fscache.h"