diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-03-15 18:09:10 +0100 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-04-15 18:10:20 +0200 |
| commit | c32a512fdf62de260ee8298436558ea50b94dfcb (patch) | |
| tree | aa5e35f5766f67a93cd4250ed307dcbf9e0be42b /drivers/md/dm-log-userspace-transfer.c | |
| parent | dm table: fall back to getting device using name_to_dev_t() (diff) | |
| download | linux-c32a512fdf62de260ee8298436558ea50b94dfcb.tar.xz linux-c32a512fdf62de260ee8298436558ea50b94dfcb.zip | |
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>
Diffstat (limited to 'drivers/md/dm-log-userspace-transfer.c')
| -rw-r--r-- | drivers/md/dm-log-userspace-transfer.c | 5 |
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, 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 @@ resend: 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), |