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

Refactor and add code for (lv) 'lv_kernel_{major|minor}' get functions.

Browse Source 
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Reviewed-By: Petr Rockai <prockai@redhat.com>
This commit is contained in:
Dave Wysochanski 2010-10-12 16:12:33 +00:00
parent e27833fb9c
commit 40c6c80723
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/metadata/lv.c
View File

@ -18,6 +18,23 @@
#include "activate.h" #include "activate.h"
#include "toolcontext.h" #include "toolcontext.h"
int lv_kernel_minor(const struct logical_volume *lv)
{
struct lvinfo info;
if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && info.exists)
return info.minor;
return -1;
}
int lv_kernel_major(const struct logical_volume *lv)
{
struct lvinfo info;
if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && info.exists)
return info.major;
return -1;
}
char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv) char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)
{ {
struct lv_segment *seg; struct lv_segment *seg;

2
lib/metadata/lv.h
View File

@ -56,5 +56,7 @@ char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv);
uint64_t lv_origin_size(const struct logical_volume *lv); uint64_t lv_origin_size(const struct logical_volume *lv);
char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv); char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv); char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv);
int lv_kernel_major(const struct logical_volume *lv);
int lv_kernel_minor(const struct logical_volume *lv);
#endif #endif

4
lib/report/properties.c
View File

@ -111,9 +111,9 @@ GET_LV_NUM_PROPERTY_FN(lv_minor, lv->minor)
#define _lv_minor_set _not_implemented_set #define _lv_minor_set _not_implemented_set
#define _lv_read_ahead_get _not_implemented_get #define _lv_read_ahead_get _not_implemented_get
#define _lv_read_ahead_set _not_implemented_set #define _lv_read_ahead_set _not_implemented_set
#define _lv_kernel_major_get _not_implemented_get GET_LV_NUM_PROPERTY_FN(lv_kernel_major, lv_kernel_major(lv))
#define _lv_kernel_major_set _not_implemented_set #define _lv_kernel_major_set _not_implemented_set
#define _lv_kernel_minor_get _not_implemented_get GET_LV_NUM_PROPERTY_FN(lv_kernel_minor, lv_kernel_minor(lv))
#define _lv_kernel_minor_set _not_implemented_set #define _lv_kernel_minor_set _not_implemented_set
#define _lv_kernel_read_ahead_get _not_implemented_get #define _lv_kernel_read_ahead_get _not_implemented_get
#define _lv_kernel_read_ahead_set _not_implemented_set #define _lv_kernel_read_ahead_set _not_implemented_set

12
lib/report/report.c
View File

@ -212,10 +212,10 @@ static int _lvkmaj_disp(struct dm_report *rh, struct dm_pool *mem __attribute__(
const void *data, void *private __attribute__((unused))) const void *data, void *private __attribute__((unused)))
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
struct lvinfo info; int major;
if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && info.exists) if ((major = lv_kernel_major(lv)) >= 0)
return dm_report_field_int(rh, field, &info.major); return dm_report_field_int(rh, field, &major);
return dm_report_field_int32(rh, field, &_minusone32); return dm_report_field_int32(rh, field, &_minusone32);
} }
@ -225,10 +225,10 @@ static int _lvkmin_disp(struct dm_report *rh, struct dm_pool *mem __attribute__(
const void *data, void *private __attribute__((unused))) const void *data, void *private __attribute__((unused)))
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
struct lvinfo info; int minor;
if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && info.exists) if ((minor = lv_kernel_minor(lv)) >= 0)
return dm_report_field_int(rh, field, &info.minor); return dm_report_field_int(rh, field, &minor);
return dm_report_field_int32(rh, field, &_minusone32); return dm_report_field_int32(rh, field, &_minusone32);
} }