shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

cleanup: using max args consistently

Browse Source 
Define and use MAX_PDATA_ARGS for thin_repair and cache_repair consistently.
This commit is contained in:
Zdenek Kabelac 2017-11-21 17:36:09 +01:00
parent 54741aeac5
commit b0398f42ad
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/lvconvert.c
View File

@ -18,6 +18,8 @@
#include "lv_alloc.h" #include "lv_alloc.h"
#include "lvconvert_poll.h" #include "lvconvert_poll.h"
#define MAX_PDATA_ARGS 10 /* Max number of accepted args for d-m-p-d tools */
typedef enum { typedef enum {
/* Split: /* Split:
* For a mirrored or raid LV, split mirror into two mirrors, optionally tracking * For a mirrored or raid LV, split mirror into two mirrors, optionally tracking
@ -2204,7 +2206,7 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd,
const struct dm_config_value *cv; const struct dm_config_value *cv;
int ret = 0, status; int ret = 0, status;
int args = 0; int args = 0;
const char *argv[19]; /* Max supported 10 args */ const char *argv[MAX_PDATA_ARGS + 7]; /* Max supported args */
char *dm_name, *trans_id_str; char *dm_name, *trans_id_str;
char meta_path[PATH_MAX]; char meta_path[PATH_MAX];
char pms_path[PATH_MAX]; char pms_path[PATH_MAX];
@ -2250,7 +2252,7 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd,
return 0; return 0;
} }
for (cv = cn->v; cv && args < 16; cv = cv->next) { for (cv = cn->v; cv && args < MAX_PDATA_ARGS; cv = cv->next) {
if (cv->type != DM_CFG_STRING) { if (cv->type != DM_CFG_STRING) {
log_error("Invalid string in config file: " log_error("Invalid string in config file: "
"global/thin_repair_options"); "global/thin_repair_options");
@ -2259,7 +2261,7 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd,
argv[++args] = cv->v.str; argv[++args] = cv->v.str;
} }
if (args == 10) { if (args >= MAX_PDATA_ARGS) {
log_error("Too many options for thin repair command."); log_error("Too many options for thin repair command.");
return 0; return 0;
} }
@ -2401,7 +2403,7 @@ static int _lvconvert_cache_repair(struct cmd_context *cmd,
const struct dm_config_value *cv; const struct dm_config_value *cv;
int ret = 0, status; int ret = 0, status;
int args = 0; int args = 0;
const char *argv[19]; /* Max supported 10 args */ const char *argv[MAX_PDATA_ARGS + 7]; /* Max supported args */
char *dm_name; char *dm_name;
char meta_path[PATH_MAX]; char meta_path[PATH_MAX];
char pms_path[PATH_MAX]; char pms_path[PATH_MAX];
@ -2448,7 +2450,7 @@ static int _lvconvert_cache_repair(struct cmd_context *cmd,
return 0; return 0;
} }
for (cv = cn->v; cv && args < 16; cv = cv->next) { for (cv = cn->v; cv && args < MAX_PDATA_ARGS; cv = cv->next) {
if (cv->type != DM_CFG_STRING) { if (cv->type != DM_CFG_STRING) {
log_error("Invalid string in config file: " log_error("Invalid string in config file: "
"global/cache_repair_options"); "global/cache_repair_options");
@ -2457,7 +2459,7 @@ static int _lvconvert_cache_repair(struct cmd_context *cmd,
argv[++args] = cv->v.str; argv[++args] = cv->v.str;
} }
if (args == 10) { if (args >= MAX_PDATA_ARGS) {
log_error("Too many options for cache repair command."); log_error("Too many options for cache repair command.");
return 0; return 0;
} }