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

Commit b08a6259 authored by Gavin Li's avatar Gavin Li Committed by Greg Kroah-Hartman
Browse files

usb: usbfs: only account once for mmap()'ed usb memory usage 



Memory usage for USB memory allocated via mmap() is already accounted
for at mmap() time; no need to account for it again at submiturb time.

Signed-off-by: default avatarGavin Li <git@thegavinli.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20190814212924.10381-1-gavinli@thegavinli.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a599e486

drivers/usb/core/devio.c

+2 −1
Original line number Diff line number Diff line
@@ -1664,7 +1664,8 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb 
	if (as->usbm)

		num_sgs = 0;



	u += sizeof(struct async) + sizeof(struct urb) + uurb->buffer_length +

	u += sizeof(struct async) + sizeof(struct urb) +

	     (as->usbm ? 0 : uurb->buffer_length) +

	     num_sgs * sizeof(struct scatterlist);

	ret = usbfs_increase_memory_usage(u);

	if (ret)