diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-02 13:38:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-02 13:38:55 -0400 |
| commit | a746ca666a8486a04b6c0584966bfce16f6b1e1a (patch) | |
| tree | 6329bff29ac8321f55d9d2c870129bdce0ad4ade /include/linux | |
| parent | 2b7497739fc8b4f411b70b78044a9fc21d34d18d (diff) | |
| parent | c034203b6a9dae6751ef4371c18cb77983e30c28 (diff) | |
Merge tag 'nfsd-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- Two minor bug fixes
* tag 'nfsd-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
nfsd: fix double fget() bug in __write_ports_addfd()
nfsd: make a copy of struct iattr before calling notify_change
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sunrpc/svcsock.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h index d16ae621782c..a7116048a4d4 100644 --- a/include/linux/sunrpc/svcsock.h +++ b/include/linux/sunrpc/svcsock.h @@ -61,10 +61,9 @@ int svc_recv(struct svc_rqst *, long); void svc_send(struct svc_rqst *rqstp); void svc_drop(struct svc_rqst *); void svc_sock_update_bufs(struct svc_serv *serv); -bool svc_alien_sock(struct net *net, int fd); -int svc_addsock(struct svc_serv *serv, const int fd, - char *name_return, const size_t len, - const struct cred *cred); +int svc_addsock(struct svc_serv *serv, struct net *net, + const int fd, char *name_return, const size_t len, + const struct cred *cred); void svc_init_xprt_sock(void); void svc_cleanup_xprt_sock(void); struct svc_xprt *svc_sock_create(struct svc_serv *serv, int prot); |