Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

6 files changed, 86 insertions, 12 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index 0dd00f4f6810..790be1472792 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -24,12 +24,21 @@
 
 struct rpcsec_gss_info;
 
+/* auth_cred ac_flags bits */
+enum {
+        RPC_CRED_NO_CRKEY_TIMEOUT = 0, /* underlying cred has no key timeout */
+        RPC_CRED_KEY_EXPIRE_SOON = 1, /* underlying cred key will expire soon */
+        RPC_CRED_NOTIFY_TIMEOUT = 2,   /* nofity generic cred when underlying
+                                        key will expire soon */
+};
+
 /* Work around the lack of a VFS credential */
 struct auth_cred {
         kuid_t  uid;
         kgid_t  gid;
         struct group_info *group_info;
         const char *principal;
+        unsigned long ac_flags;
         unsigned char machine_cred : 1;
 };
 
@@ -87,6 +96,11 @@ struct rpc_auth {
         /* per-flavor data */
 };
 
+struct rpc_auth_create_args {
+        rpc_authflavor_t pseudoflavor;
+        const char *target_name;
+};
+
 /* Flags for rpcauth_lookupcred() */
 #define RPCAUTH_LOOKUP_NEW              0x01    /* Accept an uninitialised cred */
 
@@ -97,17 +111,17 @@ struct rpc_authops {
         struct module           *owner;
         rpc_authflavor_t        au_flavor;      /* flavor (RPC_AUTH_*) */
         char *                  au_name;
-        struct rpc_auth *       (*create)(struct rpc_clnt *, rpc_authflavor_t);
+        struct rpc_auth *       (*create)(struct rpc_auth_create_args *, struct rpc_clnt *);
         void                    (*destroy)(struct rpc_auth *);
 
         struct rpc_cred *       (*lookup_cred)(struct rpc_auth *, struct auth_cred *, int);
         struct rpc_cred *       (*crcreate)(struct rpc_auth*, struct auth_cred *, int);
-        int                     (*pipes_create)(struct rpc_auth *);
-        void                    (*pipes_destroy)(struct rpc_auth *);
         int                     (*list_pseudoflavors)(rpc_authflavor_t *, int);
         rpc_authflavor_t        (*info2flavor)(struct rpcsec_gss_info *);
         int                     (*flavor2info)(rpc_authflavor_t,
                                                 struct rpcsec_gss_info *);
+        int                     (*key_timeout)(struct rpc_auth *,
+                                                struct rpc_cred *);
 };
 
 struct rpc_credops {
@@ -124,6 +138,8 @@ struct rpc_credops {
                                                 void *, __be32 *, void *);
         int                     (*crunwrap_resp)(struct rpc_task *, kxdrdproc_t,
                                                 void *, __be32 *, void *);
+        int                     (*crkey_timeout)(struct rpc_cred *);
+        bool                    (*crkey_to_expire)(struct rpc_cred *);
 };
 
 extern const struct rpc_authops authunix_ops;
@@ -140,7 +156,8 @@ struct rpc_cred *	rpc_lookup_cred(void);
 struct rpc_cred *       rpc_lookup_machine_cred(const char *service_name);
 int                     rpcauth_register(const struct rpc_authops *);
 int                     rpcauth_unregister(const struct rpc_authops *);
-struct rpc_auth *       rpcauth_create(rpc_authflavor_t, struct rpc_clnt *);
+struct rpc_auth *       rpcauth_create(struct rpc_auth_create_args *,
+                                struct rpc_clnt *);
 void                    rpcauth_release(struct rpc_auth *);
 rpc_authflavor_t        rpcauth_get_pseudoflavor(rpc_authflavor_t,
                                 struct rpcsec_gss_info *);
@@ -162,6 +179,9 @@ int			rpcauth_uptodatecred(struct rpc_task *);
 int                     rpcauth_init_credcache(struct rpc_auth *);
 void                    rpcauth_destroy_credcache(struct rpc_auth *);
 void                    rpcauth_clear_credcache(struct rpc_cred_cache *);
+int                     rpcauth_key_timeout_notify(struct rpc_auth *,
+                                                struct rpc_cred *);
+bool                    rpcauth_cred_key_to_expire(struct rpc_cred *);
 
 static inline
 struct rpc_cred *       get_rpccred(struct rpc_cred *cred)
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 6ce690de447f..437ddb6c4aef 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -264,12 +264,30 @@ static inline int get_uint(char **bpp, unsigned int *anint)
         return 0;
 }
 
+static inline int get_time(char **bpp, time_t *time)
+{
+        char buf[50];
+        long long ll;
+        int len = qword_get(bpp, buf, sizeof(buf));
+
+        if (len < 0)
+                return -EINVAL;
+        if (len == 0)
+                return -ENOENT;
+
+        if (kstrtoll(buf, 0, &ll))
+                return -EINVAL;
+
+        *time = (time_t)ll;
+        return 0;
+}
+
 static inline time_t get_expiry(char **bpp)
 {
-        int rv;
+        time_t rv;
         struct timespec boot;
 
-        if (get_int(bpp, &rv))
+        if (get_time(bpp, &rv))
                 return 0;
         if (rv < 0)
                 return 0;
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index bfe11be81f6f..6740801aa71a 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -21,6 +21,7 @@
 #include <linux/sunrpc/stats.h>
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/timer.h>
+#include <linux/sunrpc/rpc_pipe_fs.h>
 #include <asm/signal.h>
 #include <linux/path.h>
 #include <net/ipv6.h>
@@ -32,6 +33,7 @@ struct rpc_inode;
  */
 struct rpc_clnt {
         atomic_t                cl_count;       /* Number of references */
+        unsigned int            cl_clid;        /* client id */
         struct list_head        cl_clients;     /* Global list of clients */
         struct list_head        cl_tasks;       /* List of tasks */
         spinlock_t              cl_lock;        /* spinlock */
@@ -41,7 +43,6 @@ struct rpc_clnt {
                                 cl_vers,        /* RPC version number */
                                 cl_maxproc;     /* max procedure number */
 
-        const char *            cl_protname;    /* protocol name */
         struct rpc_auth *       cl_auth;        /* authenticator */
         struct rpc_stat *       cl_stats;       /* per-program statistics */
         struct rpc_iostats *    cl_metrics;     /* per-client statistics */
@@ -56,12 +57,11 @@ struct rpc_clnt {
 
         int                     cl_nodelen;     /* nodename length */
         char                    cl_nodename[UNX_MAXNODENAME];
-        struct dentry *         cl_dentry;
+        struct rpc_pipe_dir_head cl_pipedir_objects;
         struct rpc_clnt *       cl_parent;      /* Points to parent of clones */
         struct rpc_rtt          cl_rtt_default;
         struct rpc_timeout      cl_timeout_default;
         const struct rpc_program *cl_program;
-        char                    *cl_principal;  /* target to authenticate to */
 };
 
 /*
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index aa5b582cc471..a353e0300b54 100644
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -5,6 +5,26 @@
 
 #include <linux/workqueue.h>
 
+struct rpc_pipe_dir_head {
+        struct list_head pdh_entries;
+        struct dentry *pdh_dentry;
+};
+
+struct rpc_pipe_dir_object_ops;
+struct rpc_pipe_dir_object {
+        struct list_head pdo_head;
+        const struct rpc_pipe_dir_object_ops *pdo_ops;
+
+        void *pdo_data;
+};
+
+struct rpc_pipe_dir_object_ops {
+        int (*create)(struct dentry *dir,
+                        struct rpc_pipe_dir_object *pdo);
+        void (*destroy)(struct dentry *dir,
+                        struct rpc_pipe_dir_object *pdo);
+};
+
 struct rpc_pipe_msg {
         struct list_head list;
         void *data;
@@ -74,7 +94,24 @@ extern int rpc_queue_upcall(struct rpc_pipe *, struct rpc_pipe_msg *);
 
 struct rpc_clnt;
 extern struct dentry *rpc_create_client_dir(struct dentry *, const char *, struct rpc_clnt *);
-extern int rpc_remove_client_dir(struct dentry *);
+extern int rpc_remove_client_dir(struct rpc_clnt *);
+
+extern void rpc_init_pipe_dir_head(struct rpc_pipe_dir_head *pdh);
+extern void rpc_init_pipe_dir_object(struct rpc_pipe_dir_object *pdo,
+                const struct rpc_pipe_dir_object_ops *pdo_ops,
+                void *pdo_data);
+extern int rpc_add_pipe_dir_object(struct net *net,
+                struct rpc_pipe_dir_head *pdh,
+                struct rpc_pipe_dir_object *pdo);
+extern void rpc_remove_pipe_dir_object(struct net *net,
+                struct rpc_pipe_dir_head *pdh,
+                struct rpc_pipe_dir_object *pdo);
+extern struct rpc_pipe_dir_object *rpc_find_or_alloc_pipe_dir_object(
+                struct net *net,
+                struct rpc_pipe_dir_head *pdh,
+                int (*match)(struct rpc_pipe_dir_object *, void *),
+                struct rpc_pipe_dir_object *(*alloc)(void *),
+                void *data);
 
 struct cache_detail;
 extern struct dentry *rpc_create_cache_dir(struct dentry *,
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 1821445708d6..096ee58be11a 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -79,7 +79,7 @@ struct rpc_task {
         unsigned short          tk_flags;       /* misc flags */
         unsigned short          tk_timeouts;    /* maj timeouts */
 
-#ifdef RPC_DEBUG
+#if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
         unsigned short          tk_pid;         /* debugging aid */
 #endif
         unsigned char           tk_priority : 2,/* Task priority */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 1f0216b9a6c9..6eecfc2e4f98 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -243,7 +243,6 @@ struct svc_rqst {
         struct xdr_buf          rq_res;
         struct page *           rq_pages[RPCSVC_MAXPAGES];
         struct page *           *rq_respages;   /* points into rq_pages */
-        int                     rq_resused;     /* number of pages used for result */
         struct page *           *rq_next_page; /* next reply page to use */
 
         struct kvec             rq_vec[RPCSVC_MAXPAGES]; /* generally useful.. */