shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

config: Move use_mmap to local variable.

Browse Source
This commit is contained in:
Alasdair G Kergon 2018-01-10 20:35:02 +00:00
parent 6210c1ec28
commit f771d3f870
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/config/config.c
View File

@ -500,7 +500,6 @@ struct process_config_file_params {
uint32_t checksum; uint32_t checksum;
int checksum_only; int checksum_only;
int no_dup_node_check; int no_dup_node_check;
int use_mmap;
lvm_callback_fn_t config_file_read_fd_callback; lvm_callback_fn_t config_file_read_fd_callback;
void *config_file_read_fd_context; void *config_file_read_fd_context;
int ret; int ret;
@ -552,6 +551,7 @@ int config_file_read_fd(struct dm_pool *mem, struct dm_config_tree *cft, struct
char *fb; char *fb;
int r = 0; int r = 0;
off_t mmap_offset = 0; off_t mmap_offset = 0;
int use_mmap = 1;
const char *buf = NULL; const char *buf = NULL;
unsigned circular = size2 ? 1 : 0; /* Wrapped around end of disk metadata buffer? */ unsigned circular = size2 ? 1 : 0; /* Wrapped around end of disk metadata buffer? */
struct config_source *cs = dm_config_get_custom(cft); struct config_source *cs = dm_config_get_custom(cft);
@ -581,14 +581,13 @@ int config_file_read_fd(struct dm_pool *mem, struct dm_config_tree *cft, struct
pcfp->no_dup_node_check = no_dup_node_check; pcfp->no_dup_node_check = no_dup_node_check;
pcfp->config_file_read_fd_callback = config_file_read_fd_callback; pcfp->config_file_read_fd_callback = config_file_read_fd_callback;
pcfp->config_file_read_fd_context = config_file_read_fd_context; pcfp->config_file_read_fd_context = config_file_read_fd_context;
pcfp->use_mmap = 1;
pcfp->ret = 1; pcfp->ret = 1;
/* Only use mmap with regular files */ /* Only use mmap with regular files */
if (!(dev->flags & DEV_REGULAR) || circular) if (!(dev->flags & DEV_REGULAR) || circular)
pcfp->use_mmap = 0; use_mmap = 0;
if (pcfp->use_mmap) { if (use_mmap) {
mmap_offset = offset % lvm_getpagesize(); mmap_offset = offset % lvm_getpagesize();
/* memory map the file */ /* memory map the file */
fb = mmap((caddr_t) 0, size + mmap_offset, PROT_READ, fb = mmap((caddr_t) 0, size + mmap_offset, PROT_READ,