summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2013-04-11 15:26:45 +0200
committerPetr Rockai <prockai@redhat.com>2013-04-11 15:26:45 +0200
commit0e071d213da30287da009b6128a27459c4a3d7ab (patch)
tree32fc1c384cf60cf7d830bc8e5e5d3186457dfdc8
parent1578def49ce8d0067a8a6fe9a2283f14ae0bbd17 (diff)
downloadlvm2-0e071d213da30287da009b6128a27459c4a3d7ab.tar.gz
merge fixup: Add missing NULLs to lock_vol calls.
-rw-r--r--tools/pvdisplay.c2
-rw-r--r--tools/reporter.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/pvdisplay.c b/tools/pvdisplay.c
index 1b10993e8..3fe319362 100644
--- a/tools/pvdisplay.c
+++ b/tools/pvdisplay.c
@@ -96,7 +96,7 @@ int pvdisplay(struct cmd_context *cmd, int argc, char **argv)
*/
if (!lvmetad_active()) {
lock_global = 1;
- if (!lock_vol(cmd, VG_GLOBAL, LCK_VG_READ)) {
+ if (!lock_vol(cmd, VG_GLOBAL, LCK_VG_READ, NULL)) {
log_error("Unable to obtain global lock.");
return ECMD_FAILED;
}
diff --git a/tools/reporter.c b/tools/reporter.c
index a276684b0..2ae8010ca 100644
--- a/tools/reporter.c
+++ b/tools/reporter.c
@@ -324,7 +324,7 @@ static int _report(struct cmd_context *cmd, int argc, char **argv,
*/
if ((report_type == PVS || report_type == PVSEGS) && !lvmetad_active()) {
lock_global = 1;
- if (!lock_vol(cmd, VG_GLOBAL, LCK_VG_READ)) {
+ if (!lock_vol(cmd, VG_GLOBAL, LCK_VG_READ, NULL)) {
log_error("Unable to obtain global lock.");
return ECMD_FAILED;
}