Commit 46991b18 authored by Coly Li's avatar Coly Li Committed by Greg Kroah-Hartman

bcache: fix incorrect data type usage in btree_flush_write()

[ Upstream commit d1c3cc34 ]

Dan Carpenter points out that from commit 2aa8c529 ("bcache: avoid
unnecessary btree nodes flushing in btree_flush_write()"), there is a
incorrect data type usage which leads to the following static checker
	drivers/md/bcache/journal.c:444 btree_flush_write()
	warn: 'ref_nr' unsigned <= 0

   422  static void btree_flush_write(struct cache_set *c)
   423  {
   424          struct btree *b, *t, *btree_nodes[BTREE_FLUSH_NR];
   425          unsigned int i, nr, ref_nr;

   426          atomic_t *fifo_front_p, *now_fifo_front_p;
   427          size_t mask;
   429          if (c->journal.btree_flushing)
   430                  return;
   432          spin_lock(&c->journal.flush_write_lock);
   433          if (c->journal.btree_flushing) {
   434                  spin_unlock(&c->journal.flush_write_lock);
   435                  return;
   436          }
   437          c->journal.btree_flushing = true;
   438          spin_unlock(&c->journal.flush_write_lock);
   440          /* get the oldest journal entry and check its refcount */
   441          spin_lock(&c->journal.lock);
   442          fifo_front_p = &fifo_front(&c->;
   443          ref_nr = atomic_read(fifo_front_p);
   444          if (ref_nr <= 0) {
Unsigned can't be less than zero.

   445                  /*
   446                   * do nothing if no btree node references
   447                   * the oldest journal entry
   448                   */
   449                  spin_unlock(&c->journal.lock);
   450                  goto out;
   451          }
   452          spin_unlock(&c->journal.lock);

As the warning information indicates, local varaible ref_nr in unsigned
int type is wrong, which does not matche atomic_read() and the "<= 0"

This patch fixes the above error by defining local variable ref_nr as
int type.

Fixes: 2aa8c529 ("bcache: avoid unnecessary btree nodes flushing in btree_flush_write()")
Reported-by: default avatarDan Carpenter <[email protected]>
Signed-off-by: default avatarColy Li <[email protected]>
Signed-off-by: default avatarJens Axboe <[email protected]>
Signed-off-by: default avatarSasha Levin <[email protected]>
parent 328c1eab
......@@ -422,7 +422,8 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list)
static void btree_flush_write(struct cache_set *c)
struct btree *b, *t, *btree_nodes[BTREE_FLUSH_NR];
unsigned int i, nr, ref_nr;
unsigned int i, nr;
int ref_nr;
atomic_t *fifo_front_p, *now_fifo_front_p;
size_t mask;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment