shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

hints: enhance debug with log_sys_debug

Browse Source
This commit is contained in:
Zdenek Kabelac 2020-09-15 21:33:30 +02:00
parent 187cc8d344
commit 6d344b4ac0
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/label/hints.c
View File

@ -190,8 +190,10 @@ static int _hints_exists(void)
if (!stat(_hints_file, &buf)) if (!stat(_hints_file, &buf))
return 1; return 1;
if (errno != ENOENT) if (errno != ENOENT)
log_debug("hints_exist errno %d", errno); log_sys_debug("stat", _hints_file);
return 0; return 0;
} }
@ -201,8 +203,10 @@ static int _nohints_exists(void)
if (!stat(_nohints_file, &buf)) if (!stat(_nohints_file, &buf))
return 1; return 1;
if (errno != ENOENT) if (errno != ENOENT)
log_debug("nohints_exist errno %d", errno); log_sys_debug("stat", _nohints_file);
return 0; return 0;
} }
@ -212,8 +216,10 @@ static int _newhints_exists(void)
if (!stat(_newhints_file, &buf)) if (!stat(_newhints_file, &buf))
return 1; return 1;
if (errno != ENOENT) if (errno != ENOENT)
log_debug("newhints_exist errno %d", errno); log_sys_debug("stat", _newhints_file);
return 0; return 0;
} }
@ -243,29 +249,33 @@ static int _touch_hints(void)
{ {
FILE *fp; FILE *fp;
if (!(fp = fopen(_hints_file, "w"))) if (!(fp = fopen(_hints_file, "w"))) {
return_0; log_sys_debug("fopen", _hints_file);
return 0;
}
if (fclose(fp)) if (fclose(fp))
stack; log_sys_debug("fclose", _hints_file);
return 1; return 1;
} }
static void _unlink_nohints(void) static void _unlink_nohints(void)
{ {
if (unlink(_nohints_file)) if (unlink(_nohints_file))
log_debug("unlink_nohints errno %d", errno); log_sys_debug("unlink", _nohints_file);
} }
static void _unlink_hints(void) static void _unlink_hints(void)
{ {
if (unlink(_hints_file)) if (unlink(_hints_file))
log_debug("unlink_hints errno %d", errno); log_sys_debug("unlink", _hints_file);
} }
static void _unlink_newhints(void) static void _unlink_newhints(void)
{ {
if (unlink(_newhints_file)) if (unlink(_newhints_file))
log_debug("unlink_newhints errno %d", errno); log_sys_debug("unlink", _newhints_file);
} }
static int _clear_hints(struct cmd_context *cmd) static int _clear_hints(struct cmd_context *cmd)
@ -312,7 +322,7 @@ static int _lock_hints(struct cmd_context *cmd, int mode, int nonblock)
fd = open(_hints_file, O_RDWR); fd = open(_hints_file, O_RDWR);
if (fd < 0) { if (fd < 0) {
log_debug("lock_hints open errno %d", errno); log_sys_debug("open", _hints_file);
return 0; return 0;
} }
@ -324,7 +334,8 @@ static int _lock_hints(struct cmd_context *cmd, int mode, int nonblock)
} }
if (close(fd)) if (close(fd))
stack; log_sys_debug("close", _hints_file);
return 0; return 0;
} }
@ -434,7 +445,7 @@ static int _dev_in_hint_hash(struct cmd_context *cmd, struct device *dev)
return 0; return 0;
if (!dev_get_size(dev, &devsize) || !devsize) if (!dev_get_size(dev, &devsize) || !devsize)
return 0; return_0;
return 1; return 1;
} }
@ -799,7 +810,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
} }
if (fclose(fp)) if (fclose(fp))
stack; log_sys_debug("fclose", _hints_file);
if (!ret) if (!ret)
return 0; return 0;
@ -1020,7 +1031,7 @@ int write_hint_file(struct cmd_context *cmd, int newhints)
out_close: out_close:
if (fclose(fp)) if (fclose(fp))
stack; log_sys_debug("fclose", _hints_file);
out_unlock: out_unlock:
/* get_hints() took ex lock before returning with newhints set */ /* get_hints() took ex lock before returning with newhints set */
@ -1118,8 +1129,10 @@ void pvscan_recreate_hints_begin(struct cmd_context *cmd)
log_debug("pvscan_recreate_hints_begin"); log_debug("pvscan_recreate_hints_begin");
if (!_touch_hints()) if (!_touch_hints()) {
stack;
return; return;
}
/* limit potential delay blocking on hints lock next */ /* limit potential delay blocking on hints lock next */
if (!_touch_nohints()) if (!_touch_nohints())