diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2015-09-21 12:10:20 -0800 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2016-10-07 12:34:55 -0800 |
| commit | dcbbb59480385bc7f9ede5aa1fe9750519f9b3ef (patch) | |
| tree | ff1367fc7540b582adb5999e48c412bbc730a274 | |
| parent | 196f5327f7d476475f1958ae84e41c82b6511050 (diff) | |
bcache: Fix six locks on 32 bit
| -rw-r--r-- | drivers/md/bcache/six.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/bcache/six.c b/drivers/md/bcache/six.c index 737d2299a107..a3b051efa71e 100644 --- a/drivers/md/bcache/six.c +++ b/drivers/md/bcache/six.c @@ -10,13 +10,13 @@ struct six_lock_vals { /* Value we add to the lock in order to take the lock: */ - unsigned long lock_val; + u64 lock_val; /* If the lock has this value (used as a mask), taking the lock fails: */ - unsigned long lock_fail; + u64 lock_fail; /* Value we add to the lock in order to release the lock: */ - unsigned long unlock_val; + u64 unlock_val; /* Waitlist we wakeup when releasing the lock: */ enum six_lock_type unlock_wakeup; @@ -47,7 +47,7 @@ bool __six_trylock_type(struct six_lock *lock, enum six_lock_type type) { const struct six_lock_vals l[] = LOCK_VALS; union six_lock_state old; - unsigned long v = lock->state.v; + u64 v = lock->state.v; do { old.v = v; @@ -70,7 +70,7 @@ bool __six_relock_type(struct six_lock *lock, enum six_lock_type type, { const struct six_lock_vals l[] = LOCK_VALS; union six_lock_state old; - unsigned long v = lock->state.v; + u64 v = lock->state.v; do { old.v = v; @@ -184,7 +184,7 @@ bool six_trylock_convert(struct six_lock *lock, { const struct six_lock_vals l[] = LOCK_VALS; union six_lock_state old, new; - unsigned long v = lock->state.v; + u64 v = lock->state.v; do { new.v = old.v = v; |