Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields:
"Two more quick bugfixes for nfsd: fixing a regression causing mount
failures on high-memory machines and fixing the DRC over RDMA"
* tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix overflow causing non-working mounts on 1 TB machines
svcrdma: Ignore source port when computing DRC hash
+7
-2
+1
-1
fs/nfsd/nfs4state.c
+1
-1
fs/nfsd/nfs4state.c
···
1563
1563
* Never use more than a third of the remaining memory,
1564
1564
* unless it's the only way to give this client a slot:
1565
1565
*/
1566
-
avail = clamp_t(int, avail, slotsize, total_avail/3);
1566
+
avail = clamp_t(unsigned long, avail, slotsize, total_avail/3);
1567
1567
num = min_t(int, num, avail / slotsize);
1568
1568
nfsd_drc_mem_used += num * slotsize;
1569
1569
spin_unlock(&nfsd_drc_lock);
+6
-1
net/sunrpc/xprtrdma/svc_rdma_transport.c
+6
-1
net/sunrpc/xprtrdma/svc_rdma_transport.c
···
211
211
/* Save client advertised inbound read limit for use later in accept. */
212
212
newxprt->sc_ord = param->initiator_depth;
213
213
214
-
/* Set the local and remote addresses in the transport */
215
214
sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr;
216
215
svc_xprt_set_remote(&newxprt->sc_xprt, sa, svc_addr_len(sa));
216
+
/* The remote port is arbitrary and not under the control of the
217
+
* client ULP. Set it to a fixed value so that the DRC continues
218
+
* to be effective after a reconnect.
219
+
*/
220
+
rpc_set_port((struct sockaddr *)&newxprt->sc_xprt.xpt_remote, 0);
221
+
217
222
sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr;
218
223
svc_xprt_set_local(&newxprt->sc_xprt, sa, svc_addr_len(sa));
219
224