kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/include/linux/lockd/lockd.h
..
..
@@ -10,8 +10,6 @@
10
10
 #ifndef LINUX_LOCKD_LOCKD_H
11
11
 #define LINUX_LOCKD_LOCKD_H
12
12
 
13
-#ifdef __KERNEL__
14
-
15
13
 #include <linux/in.h>
16
14
 #include <linux/in6.h>
17
15
 #include <net/ipv6.h>
..
..
@@ -70,6 +68,7 @@
70
68
 	struct nsm_handle	*h_nsmhandle;	/* NSM status handle */
71
69
 	char			*h_addrbuf;	/* address eyecatcher */
72
70
 	struct net		*net;		/* host net */
71
+	const struct cred	*h_cred;
73
72
 	char			nodename[UNX_MAXNODENAME + 1];
74
73
 	const struct nlmclnt_operations	*h_nlmclnt_ops;	/* Callback ops for NLM users */
75
74
 };
..
..
@@ -229,7 +228,8 @@
229
228
 					const u32 version,
230
229
 					const char *hostname,
231
230
 					int noresvport,
232
-					struct net *net);
231
+					struct net *net,
232
+					const struct cred *cred);
233
233
 void		  nlmclnt_release_host(struct nlm_host *);
234
234
 struct nlm_host  *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
235
235
 					const char *hostname,
..
..
@@ -280,6 +280,7 @@
280
280
 					nlm_host_match_fn_t match);
281
281
 void		  nlmsvc_grant_reply(struct nlm_cookie *, __be32);
282
282
 void		  nlmsvc_release_call(struct nlm_rqst *);
283
+void		  nlmsvc_locks_init_private(struct file_lock *, struct nlm_host *, pid_t);
283
284
 
284
285
 /*
285
286
  * File handling for the server personality
..
..
@@ -287,6 +288,7 @@
287
288
 __be32		  nlm_lookup_file(struct svc_rqst *, struct nlm_file **,
288
289
 					struct nfs_fh *);
289
290
 void		  nlm_release_file(struct nlm_file *);
291
+void		  nlmsvc_release_lockowner(struct nlm_lock *);
290
292
 void		  nlmsvc_mark_resources(struct net *);
291
293
 void		  nlmsvc_free_host_resources(struct nlm_host *);
292
294
 void		  nlmsvc_invalidate_all(void);
..
..
@@ -368,7 +370,5 @@
368
370
 }
369
371
 
370
372
 extern const struct lock_manager_operations nlmsvc_lock_operations;
371
-
372
-#endif /* __KERNEL__ */
373
373
 
374
374
 #endif /* LINUX_LOCKD_LOCKD_H */