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

Configure Feed

Select the types of activity you want to include in your feed.

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: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

authored by

Anna Schumaker and committed by
Trond Myklebust
40c64c26 f9ebd618

+10 -10
+1 -1
fs/nfs/flexfilelayout/flexfilelayout.c
··· 11 11 #include <linux/module.h> 12 12 13 13 #include <linux/sunrpc/metrics.h> 14 - #include <linux/nfs_idmap.h> 15 14 16 15 #include "flexfilelayout.h" 17 16 #include "../nfs4session.h" 17 + #include "../nfs4idmap.h" 18 18 #include "../internal.h" 19 19 #include "../delegation.h" 20 20 #include "../nfs4trace.h"
+1 -1
fs/nfs/idmap.c
··· 36 36 #include <linux/types.h> 37 37 #include <linux/parser.h> 38 38 #include <linux/fs.h> 39 - #include <linux/nfs_idmap.h> 40 39 #include <net/net_namespace.h> 41 40 #include <linux/sunrpc/rpc_pipe_fs.h> 42 41 #include <linux/nfs_fs.h> ··· 48 49 49 50 #include "internal.h" 50 51 #include "netns.h" 52 + #include "nfs4idmap.h" 51 53 #include "nfs4trace.h" 52 54 53 55 #define NFS_UINT_MAXLEN 11
+1 -1
fs/nfs/nfs4client.c
··· 4 4 */ 5 5 #include <linux/module.h> 6 6 #include <linux/nfs_fs.h> 7 - #include <linux/nfs_idmap.h> 8 7 #include <linux/nfs_mount.h> 9 8 #include <linux/sunrpc/addr.h> 10 9 #include <linux/sunrpc/auth.h> ··· 14 15 #include "callback.h" 15 16 #include "delegation.h" 16 17 #include "nfs4session.h" 18 + #include "nfs4idmap.h" 17 19 #include "pnfs.h" 18 20 #include "netns.h" 19 21
+1 -1
fs/nfs/nfs4proc.c
··· 51 51 #include <linux/namei.h> 52 52 #include <linux/mount.h> 53 53 #include <linux/module.h> 54 - #include <linux/nfs_idmap.h> 55 54 #include <linux/xattr.h> 56 55 #include <linux/utsname.h> 57 56 #include <linux/freezer.h> ··· 62 63 #include "callback.h" 63 64 #include "pnfs.h" 64 65 #include "netns.h" 66 + #include "nfs4idmap.h" 65 67 #include "nfs4session.h" 66 68 #include "fscache.h" 67 69
+1 -1
fs/nfs/nfs4state.c
··· 42 42 #include <linux/slab.h> 43 43 #include <linux/fs.h> 44 44 #include <linux/nfs_fs.h> 45 - #include <linux/nfs_idmap.h> 46 45 #include <linux/kthread.h> 47 46 #include <linux/module.h> 48 47 #include <linux/random.h> ··· 56 57 #include "callback.h" 57 58 #include "delegation.h" 58 59 #include "internal.h" 60 + #include "nfs4idmap.h" 59 61 #include "nfs4session.h" 60 62 #include "pnfs.h" 61 63 #include "netns.h"
+1 -1
fs/nfs/nfs4super.c
··· 3 3 */ 4 4 #include <linux/init.h> 5 5 #include <linux/module.h> 6 - #include <linux/nfs_idmap.h> 7 6 #include <linux/nfs4_mount.h> 8 7 #include <linux/nfs_fs.h> 9 8 #include "delegation.h" 10 9 #include "internal.h" 11 10 #include "nfs4_fs.h" 11 + #include "nfs4idmap.h" 12 12 #include "dns_resolve.h" 13 13 #include "pnfs.h" 14 14 #include "nfs.h"
+1 -1
fs/nfs/nfs4sysctl.c
··· 6 6 * Copyright (c) 2006 Trond Myklebust <Trond.Myklebust@netapp.com> 7 7 */ 8 8 #include <linux/sysctl.h> 9 - #include <linux/nfs_idmap.h> 10 9 #include <linux/nfs_fs.h> 11 10 12 11 #include "nfs4_fs.h" 12 + #include "nfs4idmap.h" 13 13 #include "callback.h" 14 14 15 15 static const int nfs_set_port_min = 0;
+1 -1
fs/nfs/nfs4xdr.c
··· 52 52 #include <linux/nfs.h> 53 53 #include <linux/nfs4.h> 54 54 #include <linux/nfs_fs.h> 55 - #include <linux/nfs_idmap.h> 56 55 57 56 #include "nfs4_fs.h" 58 57 #include "internal.h" 58 + #include "nfs4idmap.h" 59 59 #include "nfs4session.h" 60 60 #include "pnfs.h" 61 61 #include "netns.h"
+1 -1
include/linux/nfs_idmap.h fs/nfs/nfs4idmap.h
··· 1 1 /* 2 - * include/linux/nfs_idmap.h 2 + * fs/nfs/nfs4idmap.h 3 3 * 4 4 * UID and GID to name mapping for clients. 5 5 *
+1 -1
include/uapi/linux/nfs_idmap.h
··· 1 1 /* 2 - * include/linux/nfs_idmap.h 2 + * include/uapi/linux/nfs_idmap.h 3 3 * 4 4 * UID and GID to name mapping for clients. 5 5 *