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

dmsetup: fix error propagation in _display_info_cols()

Browse Source 
Commit 3f35146 added a check on the value returned by the
_display_info_cols() function:

  1024         if (!_switches[COLS_ARG])
  1025                 _display_info_long(dmt, &info);
  1026         else
  1027                 r = _display_info_cols(dmt, &info);
  1028
  1029         return r;

This exposes a bug in the dmstats code in _display_info_cols:
the fact that a device has no regions is explicitly not an error
(and is documented as such in the code), but since the return
code is not changed before leaving the function it is now treated
as an error leading to:

  # dmstats list
  Command failed.

When no regions exist.

Set the return code to the correct value before returning.
This commit is contained in:
Bryn M. Reeves 2018-06-28 14:25:30 +01:00
parent f96fd9961d
commit 29b9ccd261
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libdm/dm-tools/dmsetup.c
View File

@ -943,9 +943,11 @@ static int _display_info_cols(struct dm_task *dmt, struct dm_info *info)
goto_out; goto_out;
/* No regions to report is not an error */ /* No regions to report is not an error */
if (!dm_stats_get_nr_regions(obj.stats)) if (!dm_stats_get_nr_regions(obj.stats)) {
r = 1;
goto out; goto out;
} }
}
/* group report with no groups? */ /* group report with no groups? */
if ((walk_flags == DM_STATS_WALK_GROUP) if ((walk_flags == DM_STATS_WALK_GROUP)