diff options
| author | Mark Brown <broonie@kernel.org> | 2022-11-25 22:16:05 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-11-25 22:16:05 +0300 |
| commit | 5cd4d3886780bf9a846eada29a2aefe8bfcac027 (patch) | |
| tree | ea5cc9b11657912a1371932ad467a7a622e8010c /fs/nfs/nfs4_fs.h | |
| parent | ef3232e3dbd172fa17190fa8a852a3180a73bbdc (diff) | |
| parent | f0c4d9fc9cc9462659728d168387191387e903cc (diff) | |
| download | linux-5cd4d3886780bf9a846eada29a2aefe8bfcac027.tar.xz | |
Merge tag 'v6.1-rc4' into spi-6.2
Linux 6.1-rc4 which should get my CI working on RPi3s again.
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
| -rw-r--r-- | fs/nfs/nfs4_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 400a71e75238..cfef738d765e 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -281,7 +281,7 @@ struct rpc_clnt *nfs4_negotiate_security(struct rpc_clnt *, struct inode *, int nfs4_submount(struct fs_context *, struct nfs_server *); int nfs4_replace_transport(struct nfs_server *server, const struct nfs4_fs_locations *locations); -size_t nfs_parse_server_name(char *string, size_t len, struct sockaddr *sa, +size_t nfs_parse_server_name(char *string, size_t len, struct sockaddr_storage *ss, size_t salen, struct net *net, int port); /* nfs4proc.c */ extern int nfs4_handle_exception(struct nfs_server *, int, struct nfs4_exception *); |