shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

bcache: don't use PAGE_SIZE compile const

Browse Source 
PAGE_SIZE is not a compile time constant. Use sysconf instead like
elsewhere in the code.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2018-05-16 21:19:03 +01:00 committed by Zdenek Kabelac
parent 8c453e2e5e
commit c6ca81a38d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/device/bcache.c
View File

@ -162,8 +162,9 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int fd,
struct iocb *cb_array[1]; struct iocb *cb_array[1];
struct control_block *cb; struct control_block *cb;
struct async_engine *e = _to_async(ioe); struct async_engine *e = _to_async(ioe);
long pgsize = sysconf(_SC_PAGESIZE);
if (((uintptr_t) data) & (PAGE_SIZE - 1)) { if (((uintptr_t) data) & (pgsize - 1)) {
log_warn("misaligned data buffer"); log_warn("misaligned data buffer");
return false; return false;
} }
@ -547,8 +548,9 @@ static bool _init_free_list(struct bcache *cache, unsigned count)
{ {
unsigned i; unsigned i;
size_t block_size = cache->block_sectors << SECTOR_SHIFT; size_t block_size = cache->block_sectors << SECTOR_SHIFT;
long pgsize = sysconf(_SC_PAGESIZE);
unsigned char *data = unsigned char *data =
(unsigned char *) _alloc_aligned(count * block_size, PAGE_SIZE); (unsigned char *) _alloc_aligned(count * block_size, pgsize);
/* Allocate the data for each block. We page align the data. */ /* Allocate the data for each block. We page align the data. */
if (!data) if (!data)
@ -899,6 +901,7 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks,
{ {
struct bcache *cache; struct bcache *cache;
unsigned max_io = engine->max_io(engine); unsigned max_io = engine->max_io(engine);
long pgsize = sysconf(_SC_PAGESIZE);
if (!nr_cache_blocks) { if (!nr_cache_blocks) {
log_warn("bcache must have at least one cache block"); log_warn("bcache must have at least one cache block");
@ -910,7 +913,7 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks,
return NULL; return NULL;
} }
if (block_sectors & ((PAGE_SIZE >> SECTOR_SHIFT) - 1)) { if (block_sectors & ((pgsize >> SECTOR_SHIFT) - 1)) {
log_warn("bcache block size must be a multiple of page size"); log_warn("bcache block size must be a multiple of page size");
return NULL; return NULL;
} }