diff options
Diffstat (limited to 'linux-3.3-newidmapper-02.patch')
| -rw-r--r-- | linux-3.3-newidmapper-02.patch | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/linux-3.3-newidmapper-02.patch b/linux-3.3-newidmapper-02.patch new file mode 100644 index 000000000..9307ee001 --- /dev/null +++ b/linux-3.3-newidmapper-02.patch @@ -0,0 +1,97 @@ +commit 3cd0f37a2cc9e4d6188df10041a2441eaa41d991 +Author: Bryan Schumaker <bjschuma@netapp.com> +Date: Thu Jan 26 16:54:24 2012 -0500 + + 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> + +diff -up linux-3.2.noarch/fs/nfs/idmap.c.orig linux-3.2.noarch/fs/nfs/idmap.c +--- linux-3.2.noarch/fs/nfs/idmap.c.orig 2012-01-27 10:15:42.914563082 -0500 ++++ linux-3.2.noarch/fs/nfs/idmap.c 2012-01-27 10:19:22.711401559 -0500 +@@ -39,6 +39,36 @@ + #include <linux/slab.h> + #include <linux/nfs_idmap.h> + #include <linux/nfs_fs.h> ++#include <linux/cred.h> ++#include <linux/sunrpc/sched.h> ++#include <linux/nfs4.h> ++#include <linux/nfs_fs_sb.h> ++#include <linux/keyctl.h> ++#include <linux/key-type.h> ++#include <linux/rcupdate.h> ++#include <linux/err.h> ++#include <keys/user-type.h> ++ ++/* include files needed by legacy idmapper */ ++#include <linux/module.h> ++#include <linux/mutex.h> ++#include <linux/init.h> ++#include <linux/socket.h> ++#include <linux/in.h> ++#include <linux/sched.h> ++#include <linux/sunrpc/clnt.h> ++#include <linux/workqueue.h> ++#include <linux/sunrpc/rpc_pipe_fs.h> ++#include <linux/nfs_fs.h> ++#include "nfs4_fs.h" ++ ++#define NFS_UINT_MAXLEN 11 ++#define IDMAP_HASH_SZ 128 ++ ++/* Default cache timeout is 10 minutes */ ++unsigned int nfs_idmap_cache_timeout = 600 * HZ; ++const struct cred *id_resolver_cache; ++ + + /** + * nfs_fattr_init_names - initialise the nfs_fattr owner_name/group_name fields +@@ -142,21 +172,6 @@ static int nfs_map_numeric_to_string(__u + return snprintf(buf, buflen, "%u", id); + } + +-#include <linux/cred.h> +-#include <linux/sunrpc/sched.h> +-#include <linux/nfs4.h> +-#include <linux/nfs_fs_sb.h> +-#include <linux/keyctl.h> +-#include <linux/key-type.h> +-#include <linux/rcupdate.h> +-#include <linux/err.h> +- +-#include <keys/user-type.h> +- +-#define NFS_UINT_MAXLEN 11 +- +-const struct cred *id_resolver_cache; +- + struct key_type key_type_id_resolver = { + .name = "id_resolver", + .instantiate = user_instantiate, +@@ -327,25 +342,6 @@ static int nfs_idmap_lookup_id(const cha + } + + /* idmap classic begins here */ +-#include <linux/module.h> +-#include <linux/mutex.h> +-#include <linux/init.h> +-#include <linux/socket.h> +-#include <linux/in.h> +-#include <linux/sched.h> +-#include <linux/sunrpc/clnt.h> +-#include <linux/workqueue.h> +-#include <linux/sunrpc/rpc_pipe_fs.h> +- +-#include <linux/nfs_fs.h> +- +-#include "nfs4_fs.h" +- +-#define IDMAP_HASH_SZ 128 +- +-/* Default cache timeout is 10 minutes */ +-unsigned int nfs_idmap_cache_timeout = 600 * HZ; +- + static int param_set_idmap_timeout(const char *val, struct kernel_param *kp) + { + char *endp; |