[PATCH] blk-throttle: Make total_nr_queued unsigned

[PATCH] blk-throttle: Make total_nr_queued unsigned

[Joe Perches]

cc: Vivek Goyal <vgoyal@redhat.com>

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>
---
 block/blk-throttle.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 3689f83..f6a7941 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.
-- 
1.7.6.rc1

Re: [PATCH] blk-throttle: Make total_nr_queued unsigned

[Vivek Goyal]

On Mon, Jun 13, 2011 at 08:54:48AM -0700, Joe Perches wrote:
> cc: Vivek Goyal <vgoyal@redhat.com>
> 
> 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>

Thanks. Looks good to me.

Acked-by: Vivek Goyal <vgoyal@redhat.com>

Vivek

> ---
>  block/blk-throttle.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index 3689f83..f6a7941 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.
> -- 
> 1.7.6.rc1

Re: [PATCH] blk-throttle: Make total_nr_queued unsigned

[Jens Axboe]

On 2011-06-13 17:54, Joe Perches wrote:
> cc: Vivek Goyal <vgoyal@redhat.com>
> 
> 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.

Thanks, I pulled this into for-3.1/core with the ack from Vivek.

-- 
Jens Axboe