aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-03-15 13:09:10 -0400
committerMike Snitzer <snitzer@redhat.com>2015-04-15 12:10:20 -0400
commitc32a512fdf62de260ee8298436558ea50b94dfcb (patch)
treeaa5e35f5766f67a93cd4250ed307dcbf9e0be42b
parent644bda6f346038bce7ad3ed48f7044c10dde6d47 (diff)
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>
-rw-r--r--drivers/md/dm-log-userspace-transfer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
index 39ad9664d397..fdf8ec304f8d 100644
--- a/drivers/md/dm-log-userspace-transfer.c
+++ b/drivers/md/dm-log-userspace-transfer.c
@@ -172,6 +172,7 @@ int dm_consult_userspace(const char *uuid, uint64_t luid, int request_type,
172 char *rdata, size_t *rdata_size) 172 char *rdata, size_t *rdata_size)
173{ 173{
174 int r = 0; 174 int r = 0;
175 unsigned long tmo;
175 size_t dummy = 0; 176 size_t dummy = 0;
176 int overhead_size = sizeof(struct dm_ulog_request) + sizeof(struct cn_msg); 177 int overhead_size = sizeof(struct dm_ulog_request) + sizeof(struct cn_msg);
177 struct dm_ulog_request *tfr = prealloced_ulog_tfr; 178 struct dm_ulog_request *tfr = prealloced_ulog_tfr;
@@ -236,11 +237,11 @@ resend:
236 goto out; 237 goto out;
237 } 238 }
238 239
239 r = wait_for_completion_timeout(&(pkg.complete), DM_ULOG_RETRY_TIMEOUT); 240 tmo = wait_for_completion_timeout(&(pkg.complete), DM_ULOG_RETRY_TIMEOUT);
240 spin_lock(&receiving_list_lock); 241 spin_lock(&receiving_list_lock);
241 list_del_init(&(pkg.list)); 242 list_del_init(&(pkg.list));
242 spin_unlock(&receiving_list_lock); 243 spin_unlock(&receiving_list_lock);
243 if (!r) { 244 if (!tmo) {
244 DMWARN("[%s] Request timed out: [%u/%u] - retrying", 245 DMWARN("[%s] Request timed out: [%u/%u] - retrying",
245 (strlen(uuid) > 8) ? 246 (strlen(uuid) > 8) ?
246 (uuid + (strlen(uuid) - 8)) : (uuid), 247 (uuid + (strlen(uuid) - 8)) : (uuid),