Patched in Tegra support.

3 files changed, 12 insertions, 16 deletions

diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index 4d24d64578c..fbc48f89852 100644
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -42,7 +42,6 @@ struct nlmclnt_initdata {
         unsigned short          protocol;
         u32                     nfs_version;
         int                     noresvport;
-        struct net              *net;
 };
 
 /*
@@ -54,7 +53,7 @@ extern void	nlmclnt_done(struct nlm_host *host);
 
 extern int      nlmclnt_proc(struct nlm_host *host, int cmd,
                                         struct file_lock *fl);
-extern int      lockd_up(struct net *net);
-extern void     lockd_down(struct net *net);
+extern int      lockd_up(void);
+extern void     lockd_down(void);
 
 #endif /* LINUX_LOCKD_BIND_H */
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index f5a051a7927..ff9abff55aa 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -67,7 +67,6 @@ struct nlm_host {
         struct list_head        h_reclaim;      /* Locks in RECLAIM state */
         struct nsm_handle       *h_nsmhandle;   /* NSM status handle */
         char                    *h_addrbuf;     /* address eyecatcher */
-        struct net              *net;           /* host net */
 };
 
 /*
@@ -189,14 +188,14 @@ struct nlm_block {
 /*
  * Global variables
  */
-extern const struct rpc_program nlm_program;
+extern struct rpc_program       nlm_program;
 extern struct svc_procedure     nlmsvc_procedures[];
 #ifdef CONFIG_LOCKD_V4
 extern struct svc_procedure     nlmsvc_procedures4[];
 #endif
 extern int                      nlmsvc_grace_period;
 extern unsigned long            nlmsvc_timeout;
-extern bool                     nsm_use_hostnames;
+extern int                      nsm_use_hostnames;
 extern u32                      nsm_local_state;
 
 /*
@@ -223,8 +222,7 @@ struct nlm_host  *nlmclnt_lookup_host(const struct sockaddr *sap,
                                         const unsigned short protocol,
                                         const u32 version,
                                         const char *hostname,
-                                        int noresvport,
-                                        struct net *net);
+                                        int noresvport);
 void              nlmclnt_release_host(struct nlm_host *);
 struct nlm_host  *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
                                         const char *hostname,
@@ -234,7 +232,6 @@ struct rpc_clnt * nlm_bind_host(struct nlm_host *);
 void              nlm_rebind_host(struct nlm_host *);
 struct nlm_host * nlm_get_host(struct nlm_host *);
 void              nlm_shutdown_hosts(void);
-void              nlm_shutdown_hosts_net(struct net *net);
 void              nlm_host_rebooted(const struct nlm_reboot *);
 
 /*
@@ -262,11 +259,11 @@ typedef int	  (*nlm_host_match_fn_t)(void *cur, struct nlm_host *ref);
 __be32            nlmsvc_lock(struct svc_rqst *, struct nlm_file *,
                               struct nlm_host *, struct nlm_lock *, int,
                               struct nlm_cookie *, int);
-__be32            nlmsvc_unlock(struct net *net, struct nlm_file *, struct nlm_lock *);
+__be32            nlmsvc_unlock(struct nlm_file *, struct nlm_lock *);
 __be32            nlmsvc_testlock(struct svc_rqst *, struct nlm_file *,
                         struct nlm_host *, struct nlm_lock *,
                         struct nlm_lock *, struct nlm_cookie *);
-__be32            nlmsvc_cancel_blocked(struct net *net, struct nlm_file *, struct nlm_lock *);
+__be32            nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
 unsigned long     nlmsvc_retry_blocked(void);
 void              nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
                                         nlm_host_match_fn_t match);
@@ -279,7 +276,7 @@ void		  nlmsvc_release_call(struct nlm_rqst *);
 __be32            nlm_lookup_file(struct svc_rqst *, struct nlm_file **,
                                         struct nfs_fh *);
 void              nlm_release_file(struct nlm_file *);
-void              nlmsvc_mark_resources(struct net *);
+void              nlmsvc_mark_resources(void);
 void              nlmsvc_free_host_resources(struct nlm_host *);
 void              nlmsvc_invalidate_all(void);
 
@@ -304,7 +301,7 @@ static inline int __nlm_privileged_request4(const struct sockaddr *sap)
         return ipv4_is_loopback(sin->sin_addr.s_addr);
 }
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static inline int __nlm_privileged_request6(const struct sockaddr *sap)
 {
         const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
@@ -317,12 +314,12 @@ static inline int __nlm_privileged_request6(const struct sockaddr *sap)
 
         return ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LOOPBACK;
 }
-#else   /* IS_ENABLED(CONFIG_IPV6) */
+#else   /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
 static inline int __nlm_privileged_request6(const struct sockaddr *sap)
 {
         return 0;
 }
-#endif  /* IS_ENABLED(CONFIG_IPV6) */
+#endif  /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
 
 /*
  * Ensure incoming requests are from local privileged callers.
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h
index e58c88b52ce..7353821341e 100644
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
@@ -42,6 +42,6 @@ int	nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
 int     nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
 int     nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
  */
-extern const struct rpc_version nlm_version4;
+extern struct rpc_version nlm_version4;
 
 #endif /* LOCKD_XDR4_H */