summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-06-13 20:19:27 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-06-13 20:19:27 +0200
commitd2f31a5fd60d168b00fc4f7617b68a1287b21e90 (patch)
treec51b882926a840df57e376d21df74ec4177561a3 /block
parentfd16d263194aa6b50b215eb593a567b59d744d6e (diff)
downloadlinux-3.10-d2f31a5fd60d168b00fc4f7617b68a1287b21e90.tar.gz
linux-3.10-d2f31a5fd60d168b00fc4f7617b68a1287b21e90.tar.bz2
linux-3.10-d2f31a5fd60d168b00fc4f7617b68a1287b21e90.zip
blk-throttle: Make total_nr_queued unsigned
The total of two unsigned values should also be unsigned. Update throtl_log output to unsigned. Update total_nr_queued test to non-zero to be the same as the other total_nr_queued tests. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-throttle.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 3689f833afd..f6a79412050 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -142,9 +142,9 @@ static inline struct throtl_grp *tg_of_blkg(struct blkio_group *blkg)
return NULL;
}
-static inline int total_nr_queued(struct throtl_data *td)
+static inline unsigned int total_nr_queued(struct throtl_data *td)
{
- return (td->nr_queued[0] + td->nr_queued[1]);
+ return td->nr_queued[0] + td->nr_queued[1];
}
static inline struct throtl_grp *throtl_ref_get_tg(struct throtl_grp *tg)
@@ -927,7 +927,7 @@ static int throtl_dispatch(struct request_queue *q)
bio_list_init(&bio_list_on_stack);
- throtl_log(td, "dispatch nr_queued=%d read=%u write=%u",
+ throtl_log(td, "dispatch nr_queued=%u read=%u write=%u",
total_nr_queued(td), td->nr_queued[READ],
td->nr_queued[WRITE]);
@@ -970,7 +970,7 @@ throtl_schedule_delayed_work(struct throtl_data *td, unsigned long delay)
struct delayed_work *dwork = &td->throtl_work;
/* schedule work if limits changed even if no bio is queued */
- if (total_nr_queued(td) > 0 || td->limits_changed) {
+ if (total_nr_queued(td) || td->limits_changed) {
/*
* We might have a work scheduled to be executed in future.
* Cancel that and schedule a new one.