c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix do_div() types in condvar:timeout

Browse Source 
The do_div() macro expects unsigned types and this is detected in
powerpc implementation of do_div().

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #516
This commit is contained in:
Brian Behlendorf 2015-12-22 09:26:10 -08:00
parent b4ad50ac5f
commit 2a552736b7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module/splat/splat-condvar.c
View File

@ -383,8 +383,8 @@ splat_condvar_test5(struct file *file, void *arg)
kcondvar_t condvar; kcondvar_t condvar;
kmutex_t mtx; kmutex_t mtx;
clock_t time_left, time_before, time_after, time_delta; clock_t time_left, time_before, time_after, time_delta;
int64_t whole_delta; uint64_t whole_delta;
int32_t remain_delta; uint32_t remain_delta;
int rc = 0; int rc = 0;
mutex_init(&mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL); mutex_init(&mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
@ -408,19 +408,20 @@ splat_condvar_test5(struct file *file, void *arg)
splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME,
"Thread correctly timed out and was asleep " "Thread correctly timed out and was asleep "
"for %d.%d seconds (%d second min)\n", "for %d.%d seconds (%d second min)\n",
(int)whole_delta, remain_delta, 1); (int)whole_delta, (int)remain_delta, 1);
} else { } else {
splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME,
"Thread correctly timed out but was only " "Thread correctly timed out but was only "
"asleep for %d.%d seconds (%d second " "asleep for %d.%d seconds (%d second "
"min)\n", (int)whole_delta, remain_delta, 1); "min)\n", (int)whole_delta,
(int)remain_delta, 1);
rc = -ETIMEDOUT; rc = -ETIMEDOUT;
} }
} else { } else {
splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME,
"Thread exited after only %d.%d seconds, it " "Thread exited after only %d.%d seconds, it "
"did not hit the %d second timeout\n", "did not hit the %d second timeout\n",
(int)whole_delta, remain_delta, 1); (int)whole_delta, (int)remain_delta, 1);
rc = -ETIMEDOUT; rc = -ETIMEDOUT;
} }