|
@@ -106,7 +106,7 @@ static void zram_set_obj_size(struct zram_meta *meta,
|
|
|
meta->table[index].value = (flags << ZRAM_FLAG_SHIFT) | size;
|
|
meta->table[index].value = (flags << ZRAM_FLAG_SHIFT) | size;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-static inline int is_partial_io(struct bio_vec *bvec)
|
|
|
|
|
|
|
+static inline bool is_partial_io(struct bio_vec *bvec)
|
|
|
{
|
|
{
|
|
|
return bvec->bv_len != PAGE_SIZE;
|
|
return bvec->bv_len != PAGE_SIZE;
|
|
|
}
|
|
}
|
|
@@ -114,25 +114,25 @@ static inline int is_partial_io(struct bio_vec *bvec)
|
|
|
/*
|
|
/*
|
|
|
* Check if request is within bounds and aligned on zram logical blocks.
|
|
* Check if request is within bounds and aligned on zram logical blocks.
|
|
|
*/
|
|
*/
|
|
|
-static inline int valid_io_request(struct zram *zram,
|
|
|
|
|
|
|
+static inline bool valid_io_request(struct zram *zram,
|
|
|
sector_t start, unsigned int size)
|
|
sector_t start, unsigned int size)
|
|
|
{
|
|
{
|
|
|
u64 end, bound;
|
|
u64 end, bound;
|
|
|
|
|
|
|
|
/* unaligned request */
|
|
/* unaligned request */
|
|
|
if (unlikely(start & (ZRAM_SECTOR_PER_LOGICAL_BLOCK - 1)))
|
|
if (unlikely(start & (ZRAM_SECTOR_PER_LOGICAL_BLOCK - 1)))
|
|
|
- return 0;
|
|
|
|
|
|
|
+ return false;
|
|
|
if (unlikely(size & (ZRAM_LOGICAL_BLOCK_SIZE - 1)))
|
|
if (unlikely(size & (ZRAM_LOGICAL_BLOCK_SIZE - 1)))
|
|
|
- return 0;
|
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
|
|
end = start + (size >> SECTOR_SHIFT);
|
|
end = start + (size >> SECTOR_SHIFT);
|
|
|
bound = zram->disksize >> SECTOR_SHIFT;
|
|
bound = zram->disksize >> SECTOR_SHIFT;
|
|
|
/* out of range range */
|
|
/* out of range range */
|
|
|
if (unlikely(start >= bound || end > bound || start > end))
|
|
if (unlikely(start >= bound || end > bound || start > end))
|
|
|
- return 0;
|
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
|
|
/* I/O request is valid */
|
|
/* I/O request is valid */
|
|
|
- return 1;
|
|
|
|
|
|
|
+ return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void update_position(u32 *index, int *offset, struct bio_vec *bvec)
|
|
static void update_position(u32 *index, int *offset, struct bio_vec *bvec)
|
|
@@ -157,7 +157,7 @@ static inline void update_used_max(struct zram *zram,
|
|
|
} while (old_max != cur_max);
|
|
} while (old_max != cur_max);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-static int page_zero_filled(void *ptr)
|
|
|
|
|
|
|
+static bool page_zero_filled(void *ptr)
|
|
|
{
|
|
{
|
|
|
unsigned int pos;
|
|
unsigned int pos;
|
|
|
unsigned long *page;
|
|
unsigned long *page;
|
|
@@ -166,10 +166,10 @@ static int page_zero_filled(void *ptr)
|
|
|
|
|
|
|
|
for (pos = 0; pos != PAGE_SIZE / sizeof(*page); pos++) {
|
|
for (pos = 0; pos != PAGE_SIZE / sizeof(*page); pos++) {
|
|
|
if (page[pos])
|
|
if (page[pos])
|
|
|
- return 0;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return 1;
|
|
|
|
|
|
|
+ return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void handle_zero_page(struct bio_vec *bvec)
|
|
static void handle_zero_page(struct bio_vec *bvec)
|