Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

authored by

Nicholas Mc Guire and committed by
Mike Snitzer
c32a512f 644bda6f

+3 -2
+3 -2
drivers/md/dm-log-userspace-transfer.c
··· 172 172 char *rdata, size_t *rdata_size) 173 173 { 174 174 int r = 0; 175 + unsigned long tmo; 175 176 size_t dummy = 0; 176 177 int overhead_size = sizeof(struct dm_ulog_request) + sizeof(struct cn_msg); 177 178 struct dm_ulog_request *tfr = prealloced_ulog_tfr; ··· 237 236 goto out; 238 237 } 239 238 240 - r = wait_for_completion_timeout(&(pkg.complete), DM_ULOG_RETRY_TIMEOUT); 239 + tmo = wait_for_completion_timeout(&(pkg.complete), DM_ULOG_RETRY_TIMEOUT); 241 240 spin_lock(&receiving_list_lock); 242 241 list_del_init(&(pkg.list)); 243 242 spin_unlock(&receiving_list_lock); 244 - if (!r) { 243 + if (!tmo) { 245 244 DMWARN("[%s] Request timed out: [%u/%u] - retrying", 246 245 (strlen(uuid) > 8) ? 247 246 (uuid + (strlen(uuid) - 8)) : (uuid),