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

Commit c32a512f authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mike Snitzer
Browse files

dm log userspace transfer: match wait_for_completion_timeout return type 



Return type of wait_for_completion_timeout() is unsigned long not int.
An appropriately named unsigned long is added and the assignment fixed.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 644bda6f

drivers/md/dm-log-userspace-transfer.c

+3 −2
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ int dm_consult_userspace(const char *uuid, uint64_t luid, int request_type, 
			 char *rdata, size_t *rdata_size)

{

	int r = 0;

	unsigned long tmo;

	size_t dummy = 0;

	int overhead_size = sizeof(struct dm_ulog_request) + sizeof(struct cn_msg);

	struct dm_ulog_request *tfr = prealloced_ulog_tfr;
@@ -236,11 +237,11 @@ int dm_consult_userspace(const char *uuid, uint64_t luid, int request_type, 
		goto out;

	}



	r = wait_for_completion_timeout(&(pkg.complete), DM_ULOG_RETRY_TIMEOUT);

	tmo = wait_for_completion_timeout(&(pkg.complete), DM_ULOG_RETRY_TIMEOUT);

	spin_lock(&receiving_list_lock);

	list_del_init(&(pkg.list));

	spin_unlock(&receiving_list_lock);

	if (!r) {

	if (!tmo) {

		DMWARN("[%s] Request timed out: [%u/%u] - retrying",

		       (strlen(uuid) > 8) ?

		       (uuid + (strlen(uuid) - 8)) : (uuid),