tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
NFS: Keep idmapper include files in one place
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
authored by
Bryan Schumaker
and committed by
Trond Myklebust
3cd0f37a
e6499c6f
+31
-35
+31
-35
fs/nfs/idmap.c
+31
-35
fs/nfs/idmap.c
···
39
39
#include <linux/slab.h>
40
40
#include <linux/nfs_idmap.h>
41
41
#include <linux/nfs_fs.h>
42
+
#include <linux/cred.h>
43
+
#include <linux/sunrpc/sched.h>
44
+
#include <linux/nfs4.h>
45
+
#include <linux/nfs_fs_sb.h>
46
+
#include <linux/keyctl.h>
47
+
#include <linux/key-type.h>
48
+
#include <linux/rcupdate.h>
49
+
#include <linux/err.h>
50
+
#include <keys/user-type.h>
51
+
52
+
/* include files needed by legacy idmapper */
53
+
#include <linux/module.h>
54
+
#include <linux/mutex.h>
55
+
#include <linux/init.h>
56
+
#include <linux/socket.h>
57
+
#include <linux/in.h>
58
+
#include <linux/sched.h>
59
+
#include <linux/sunrpc/clnt.h>
60
+
#include <linux/workqueue.h>
61
+
#include <linux/sunrpc/rpc_pipe_fs.h>
62
+
#include <linux/nfs_fs.h>
63
+
#include "nfs4_fs.h"
64
+
#include "internal.h"
65
+
66
+
#define NFS_UINT_MAXLEN 11
67
+
#define IDMAP_HASH_SZ 128
68
+
69
+
/* Default cache timeout is 10 minutes */
70
+
unsigned int nfs_idmap_cache_timeout = 600 * HZ;
71
+
const struct cred *id_resolver_cache;
72
+
42
73
43
74
/**
44
75
* nfs_fattr_init_names - initialise the nfs_fattr owner_name/group_name fields
···
172
141
{
173
142
return snprintf(buf, buflen, "%u", id);
174
143
}
175
-
176
-
#include <linux/cred.h>
177
-
#include <linux/sunrpc/sched.h>
178
-
#include <linux/nfs4.h>
179
-
#include <linux/nfs_fs_sb.h>
180
-
#include <linux/keyctl.h>
181
-
#include <linux/key-type.h>
182
-
#include <linux/rcupdate.h>
183
-
#include <linux/err.h>
184
-
185
-
#include <keys/user-type.h>
186
-
187
-
#define NFS_UINT_MAXLEN 11
188
-
189
-
const struct cred *id_resolver_cache;
190
144
191
145
struct key_type key_type_id_resolver = {
192
146
.name = "id_resolver",
···
343
327
}
344
328
345
329
/* idmap classic begins here */
346
-
#include <linux/module.h>
347
-
#include <linux/mutex.h>
348
-
#include <linux/init.h>
349
-
#include <linux/socket.h>
350
-
#include <linux/in.h>
351
-
#include <linux/sched.h>
352
-
#include <linux/sunrpc/clnt.h>
353
-
#include <linux/workqueue.h>
354
-
#include <linux/sunrpc/rpc_pipe_fs.h>
355
-
356
-
#include <linux/nfs_fs.h>
357
-
358
-
#include "nfs4_fs.h"
359
-
#include "internal.h"
360
-
361
-
#define IDMAP_HASH_SZ 128
362
-
363
-
/* Default cache timeout is 10 minutes */
364
-
unsigned int nfs_idmap_cache_timeout = 600 * HZ;
365
-
366
330
static int param_set_idmap_timeout(const char *val, struct kernel_param *kp)
367
331
{
368
332
char *endp;