Commit 58ebe3e7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

ubd: move setting the variable queue limits to ubd_add 



No reason to delay this until open time.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
Link: https://lore.kernel.org/r/20240222072417.3773131-5-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b8b364d2

arch/um/drivers/ubd_kern.c

+7 −6
Original line number Diff line number Diff line
@@ -772,8 +772,6 @@ static int ubd_open_dev(struct ubd *ubd_dev) 
	ubd_dev->fd = fd;



	if(ubd_dev->cow.file != NULL){

		blk_queue_max_hw_sectors(ubd_dev->queue, 8 * sizeof(long));



		err = -ENOMEM;

		ubd_dev->cow.bitmap = vmalloc(ubd_dev->cow.bitmap_len);

		if(ubd_dev->cow.bitmap == NULL){
@@ -795,10 +793,6 @@ static int ubd_open_dev(struct ubd *ubd_dev) 
		if(err < 0) goto error;

		ubd_dev->cow.fd = err;

	}

	if (ubd_dev->no_trim == 0) {

		blk_queue_max_discard_sectors(ubd_dev->queue, UBD_MAX_REQUEST);

		blk_queue_max_write_zeroes_sectors(ubd_dev->queue, UBD_MAX_REQUEST);

	}

	return 0;

 error:

	os_close_file(ubd_dev->fd);
@@ -867,6 +861,13 @@ static int ubd_add(int n, char **error_out) 
	if(ubd_dev->file == NULL)

		goto out;



	if (ubd_dev->cow.file)

		lim.max_hw_sectors = 8 * sizeof(long);

	if (!ubd_dev->no_trim) {

		lim.max_hw_discard_sectors = UBD_MAX_REQUEST;

		lim.max_write_zeroes_sectors = UBD_MAX_REQUEST;

	}



	err = ubd_file_size(ubd_dev, &ubd_dev->size);

	if(err < 0){

		*error_out = "Couldn't determine size of device's file";