mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-23 05:56:14 -04:00
dm: change "unsigned" to "unsigned int"
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com> Signed-off-by: Mike Snitzer <snitzer@kernel.org>
This commit is contained in:
committed by
Mike Snitzer
parent
238d991f05
commit
86a3238c7b
@@ -127,7 +127,7 @@ static void *dm_bitmap_data(struct dm_block *b)
|
||||
|
||||
#define WORD_MASK_HIGH 0xAAAAAAAAAAAAAAAAULL
|
||||
|
||||
static unsigned dm_bitmap_word_used(void *addr, unsigned b)
|
||||
static unsigned int dm_bitmap_word_used(void *addr, unsigned int b)
|
||||
{
|
||||
__le64 *words_le = addr;
|
||||
__le64 *w_le = words_le + (b >> ENTRIES_SHIFT);
|
||||
@@ -138,11 +138,11 @@ static unsigned dm_bitmap_word_used(void *addr, unsigned b)
|
||||
return !(~bits & mask);
|
||||
}
|
||||
|
||||
static unsigned sm_lookup_bitmap(void *addr, unsigned b)
|
||||
static unsigned int sm_lookup_bitmap(void *addr, unsigned int b)
|
||||
{
|
||||
__le64 *words_le = addr;
|
||||
__le64 *w_le = words_le + (b >> ENTRIES_SHIFT);
|
||||
unsigned hi, lo;
|
||||
unsigned int hi, lo;
|
||||
|
||||
b = (b & (ENTRIES_PER_WORD - 1)) << 1;
|
||||
hi = !!test_bit_le(b, (void *) w_le);
|
||||
@@ -150,7 +150,7 @@ static unsigned sm_lookup_bitmap(void *addr, unsigned b)
|
||||
return (hi << 1) | lo;
|
||||
}
|
||||
|
||||
static void sm_set_bitmap(void *addr, unsigned b, unsigned val)
|
||||
static void sm_set_bitmap(void *addr, unsigned int b, unsigned int val)
|
||||
{
|
||||
__le64 *words_le = addr;
|
||||
__le64 *w_le = words_le + (b >> ENTRIES_SHIFT);
|
||||
@@ -168,8 +168,8 @@ static void sm_set_bitmap(void *addr, unsigned b, unsigned val)
|
||||
__clear_bit_le(b + 1, (void *) w_le);
|
||||
}
|
||||
|
||||
static int sm_find_free(void *addr, unsigned begin, unsigned end,
|
||||
unsigned *result)
|
||||
static int sm_find_free(void *addr, unsigned int begin, unsigned int end,
|
||||
unsigned int *result)
|
||||
{
|
||||
while (begin < end) {
|
||||
if (!(begin & (ENTRIES_PER_WORD - 1)) &&
|
||||
@@ -238,7 +238,7 @@ int sm_ll_extend(struct ll_disk *ll, dm_block_t extra_blocks)
|
||||
{
|
||||
int r;
|
||||
dm_block_t i, nr_blocks, nr_indexes;
|
||||
unsigned old_blocks, blocks;
|
||||
unsigned int old_blocks, blocks;
|
||||
|
||||
nr_blocks = ll->nr_blocks + extra_blocks;
|
||||
old_blocks = dm_sector_div_up(ll->nr_blocks, ll->entries_per_block);
|
||||
@@ -352,7 +352,7 @@ int sm_ll_find_free_block(struct ll_disk *ll, dm_block_t begin,
|
||||
|
||||
for (i = index_begin; i < index_end; i++, begin = 0) {
|
||||
struct dm_block *blk;
|
||||
unsigned position;
|
||||
unsigned int position;
|
||||
uint32_t bit_end;
|
||||
|
||||
r = ll->load_ie(ll, i, &ie_disk);
|
||||
@@ -370,7 +370,7 @@ int sm_ll_find_free_block(struct ll_disk *ll, dm_block_t begin,
|
||||
bit_end = (i == index_end - 1) ? end : ll->entries_per_block;
|
||||
|
||||
r = sm_find_free(dm_bitmap_data(blk),
|
||||
max_t(unsigned, begin, le32_to_cpu(ie_disk.none_free_before)),
|
||||
max_t(unsigned int, begin, le32_to_cpu(ie_disk.none_free_before)),
|
||||
bit_end, &position);
|
||||
if (r == -ENOSPC) {
|
||||
/*
|
||||
@@ -1098,7 +1098,7 @@ static inline int ie_cache_writeback(struct ll_disk *ll, struct ie_cache *iec)
|
||||
&iec->index, &iec->ie, &ll->bitmap_root);
|
||||
}
|
||||
|
||||
static inline unsigned hash_index(dm_block_t index)
|
||||
static inline unsigned int hash_index(dm_block_t index)
|
||||
{
|
||||
return dm_hash_block(index, IE_CACHE_MASK);
|
||||
}
|
||||
@@ -1107,7 +1107,7 @@ static int disk_ll_load_ie(struct ll_disk *ll, dm_block_t index,
|
||||
struct disk_index_entry *ie)
|
||||
{
|
||||
int r;
|
||||
unsigned h = hash_index(index);
|
||||
unsigned int h = hash_index(index);
|
||||
struct ie_cache *iec = ll->ie_cache + h;
|
||||
|
||||
if (iec->valid) {
|
||||
@@ -1138,7 +1138,7 @@ static int disk_ll_save_ie(struct ll_disk *ll, dm_block_t index,
|
||||
struct disk_index_entry *ie)
|
||||
{
|
||||
int r;
|
||||
unsigned h = hash_index(index);
|
||||
unsigned int h = hash_index(index);
|
||||
struct ie_cache *iec = ll->ie_cache + h;
|
||||
|
||||
ll->bitmap_index_changed = true;
|
||||
@@ -1165,7 +1165,7 @@ static int disk_ll_save_ie(struct ll_disk *ll, dm_block_t index,
|
||||
|
||||
static int disk_ll_init_index(struct ll_disk *ll)
|
||||
{
|
||||
unsigned i;
|
||||
unsigned int i;
|
||||
for (i = 0; i < IE_CACHE_SIZE; i++) {
|
||||
struct ie_cache *iec = ll->ie_cache + i;
|
||||
iec->valid = false;
|
||||
@@ -1187,7 +1187,7 @@ static dm_block_t disk_ll_max_entries(struct ll_disk *ll)
|
||||
static int disk_ll_commit(struct ll_disk *ll)
|
||||
{
|
||||
int r = 0;
|
||||
unsigned i;
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < IE_CACHE_SIZE; i++) {
|
||||
struct ie_cache *iec = ll->ie_cache + i;
|
||||
|
||||
Reference in New Issue
Block a user