Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-block.git] / block / blk-rq-qos.c

diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index d3a75693adbf4ddf9ffb94b07d4302ffcd2ea0cb..88f0fe7dcf5451915cb950b3dc4cbd88ad5b7696 100644 (file)
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -10,16 +10,10 @@ static bool atomic_inc_below(atomic_t *v, unsigned int below)
 {
        unsigned int cur = atomic_read(v);
 
-       for (;;) {
-               unsigned int old;
-
+       do {
                if (cur >= below)
                        return false;
-               old = atomic_cmpxchg(v, cur, cur + 1);
-               if (old == cur)
-                       break;
-               cur = old;
-       }
+       } while (!atomic_try_cmpxchg(v, &cur, cur + 1));
 
        return true;
 }