diff options
| author | Linus Torvalds | 2020-08-15 08:34:36 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-08-15 08:34:36 -0700 |
| commit | 410520d07f5c66a6c1f3eb7ef2063d9bdd3d440b (patch) | |
| tree | c1361018754f92dbaa7ce7045cd8bd8b8890fb45 /net/9p | |
| parent | f6513bd39c15af8f8a63b1fbfcb1bf4717241655 (diff) | |
| parent | 2ed0b7578170c3bab10cde09d4440897b305e40c (diff) | |
Merge tag '9p-for-5.9-rc1' of git://github.com/martinetd/linux
Pull 9p updates from Dominique Martinet:
- some code cleanup
- a couple of static analysis fixes
- setattr: try to pick a fid associated with the file rather than the
dentry, which might sometimes matter
* tag '9p-for-5.9-rc1' of git://github.com/martinetd/linux:
9p: Remove unneeded cast from memory allocation
9p: remove unused code in 9p
net/9p: Fix sparse endian warning in trans_fd.c
9p: Fix memory leak in v9fs_mount
9p: retrieve fid from file when file instance exist.
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_fd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 12ecacf0c55f..c0762a302162 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -950,7 +950,7 @@ static int p9_bind_privport(struct socket *sock) memset(&cl, 0, sizeof(cl)); cl.sin_family = AF_INET; - cl.sin_addr.s_addr = INADDR_ANY; + cl.sin_addr.s_addr = htonl(INADDR_ANY); for (port = p9_ipport_resv_max; port >= p9_ipport_resv_min; port--) { cl.sin_port = htons((ushort)port); err = kernel_bind(sock, (struct sockaddr *)&cl, sizeof(cl)); |