io_u_queue: add debug assert check on adding too many elements

Caught a bug in the io-threads branch, lets merge it into master.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/io_u_queue.c b/io_u_queue.c
index 80a32ba3afd20d4a8b3669935ca10d035720a554..9994c7879a066a6b277b1863bd6e7f902ba01795 100644 (file)
--- a/io_u_queue.c
+++ b/io_u_queue.c
@@ -8,6 +8,7 @@ int io_u_qinit(struct io_u_queue *q, unsigned int nr)
                return 1;
 
        q->nr = 0;
                return 1;
 
        q->nr = 0;

+       q->max = nr;

        return 0;
 }
 
        return 0;
 }
 

diff --git a/io_u_queue.h b/io_u_queue.h
index bda40d5ea263920055f6d75c62bdca8e4559034c..118e59342b5da4bd814be51aa7f561d519603838 100644 (file)
--- a/io_u_queue.h
+++ b/io_u_queue.h
@@ -8,6 +8,7 @@ struct io_u;
 struct io_u_queue {
        struct io_u **io_us;
        unsigned int nr;
 struct io_u_queue {
        struct io_u **io_us;
        unsigned int nr;

+       unsigned int max;

 };
 
 static inline struct io_u *io_u_qpop(struct io_u_queue *q)
 };
 
 static inline struct io_u *io_u_qpop(struct io_u_queue *q)


@@ -25,7 +26,12 @@ static inline struct io_u *io_u_qpop(struct io_u_queue *q)
 
 static inline void io_u_qpush(struct io_u_queue *q, struct io_u *io_u)
 {
 
 static inline void io_u_qpush(struct io_u_queue *q, struct io_u *io_u)
 {

-       q->io_us[q->nr++] = io_u;
+       if (q->nr < q->max) {
+               q->io_us[q->nr++] = io_u;
+               return;
+       }
+
+       assert(0);

 }
 
 static inline int io_u_qempty(const struct io_u_queue *q)
 }
 
 static inline int io_u_qempty(const struct io_u_queue *q)