Skip to content

Commit

Permalink
bcache: use kvfree() in various places
Browse files Browse the repository at this point in the history
Use kvfree() instead of open-coding it.

Signed-off-by: Pekka Enberg <penberg@kernel.org>
Cc: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Pekka Enberg authored and Linus Torvalds committed Jul 1, 2015
1 parent 32a78fa commit 958b433
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
10 changes: 2 additions & 8 deletions drivers/md/bcache/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -760,14 +760,8 @@ static void bcache_device_free(struct bcache_device *d)
bio_split_pool_free(&d->bio_split_hook);
if (d->bio_split)
bioset_free(d->bio_split);
if (is_vmalloc_addr(d->full_dirty_stripes))
vfree(d->full_dirty_stripes);
else
kfree(d->full_dirty_stripes);
if (is_vmalloc_addr(d->stripe_sectors_dirty))
vfree(d->stripe_sectors_dirty);
else
kfree(d->stripe_sectors_dirty);
kvfree(d->full_dirty_stripes);
kvfree(d->stripe_sectors_dirty);

closure_debug_destroy(&d->cl);
}
Expand Down
10 changes: 2 additions & 8 deletions drivers/md/bcache/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ struct closure;

#define free_heap(heap) \
do { \
if (is_vmalloc_addr((heap)->data)) \
vfree((heap)->data); \
else \
kfree((heap)->data); \
kvfree((heap)->data); \
(heap)->data = NULL; \
} while (0)

Expand Down Expand Up @@ -163,10 +160,7 @@ do { \

#define free_fifo(fifo) \
do { \
if (is_vmalloc_addr((fifo)->data)) \
vfree((fifo)->data); \
else \
kfree((fifo)->data); \
kvfree((fifo)->data); \
(fifo)->data = NULL; \
} while (0)

Expand Down

0 comments on commit 958b433

Please sign in to comment.