Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8f46b5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3f9c4dc6 3b2d4dcf

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -1563,7 +1563,7 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca) 
	 * Never use more than a third of the remaining memory,

	 * unless it's the only way to give this client a slot:

	 */

	avail = clamp_t(int, avail, slotsize, total_avail/3);

	avail = clamp_t(unsigned long, avail, slotsize, total_avail/3);

	num = min_t(int, num, avail / slotsize);

	nfsd_drc_mem_used += num * slotsize;

	spin_unlock(&nfsd_drc_lock);

net/sunrpc/xprtrdma/svc_rdma_transport.c

+6 −1
Original line number Diff line number Diff line
@@ -211,9 +211,14 @@ static void handle_connect_req(struct rdma_cm_id *new_cma_id, 
	/* Save client advertised inbound read limit for use later in accept. */

	newxprt->sc_ord = param->initiator_depth;



	/* Set the local and remote addresses in the transport */

	sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr;

	svc_xprt_set_remote(&newxprt->sc_xprt, sa, svc_addr_len(sa));

	/* The remote port is arbitrary and not under the control of the

	 * client ULP. Set it to a fixed value so that the DRC continues

	 * to be effective after a reconnect.

	 */

	rpc_set_port((struct sockaddr *)&newxprt->sc_xprt.xpt_remote, 0);



	sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr;

	svc_xprt_set_local(&newxprt->sc_xprt, sa, svc_addr_len(sa));