Merge Linus master into drm-next

[linux-2.6-microblaze.git] / drivers / md / dm-log-userspace-transfer.c

diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
index 39ad966..fdf8ec3 100644 (file)
--- 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),