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

vgmknodes also creates necessary nodes in /dev/mapper

Browse Source
This commit is contained in:
Alasdair Kergon 2003-11-13 14:11:41 +00:00
parent 2864846d91
commit 8c0388e487
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/activate/activate.c
View File

@ -152,7 +152,8 @@ int driver_version(char *version, size_t size)
/*
* Returns 1 if info structure populated, else 0 on failure.
*/
int lv_info(const struct logical_volume *lv, struct lvinfo *info)
static int _lv_info(const struct logical_volume *lv, int mknodes,
struct lvinfo *info)
{
int r;
struct dev_manager *dm;
@ -166,7 +167,7 @@ int lv_info(const struct logical_volume *lv, struct lvinfo *info)
return 0;
}
if (!(r = dev_manager_info(dm, lv, &dminfo)))
if (!(r = dev_manager_info(dm, lv, mknodes, &dminfo)))
stack;
info->exists = dminfo.exists;
@ -180,6 +181,11 @@ int lv_info(const struct logical_volume *lv, struct lvinfo *info)
return r;
}
int lv_info(const struct logical_volume *lv, struct lvinfo *info)
{
return _lv_info(lv, 0, info);
}
/*
* Returns 1 if percent set, else 0 on failure.
*/
@ -486,7 +492,7 @@ int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv)
struct lvinfo info;
int r = 1;
if (!lv_info(lv, &info)) {
if (!_lv_info(lv, 1, &info)) {
stack;
return 0;
}

23
lib/activate/dev_manager.c
View File

@ -285,13 +285,16 @@ static struct dm_task *_setup_task(const char *name, const char *uuid,
}
static int _info_run(const char *name, const char *uuid, struct dm_info *info,
struct pool *mem, char **uuid_out)
int mknodes, struct pool *mem, char **uuid_out)
{
int r = 0;
struct dm_task *dmt;
const char *u;
int dmtask;
if (!(dmt = _setup_task(name, uuid, 0, DM_DEVICE_INFO))) {
dmtask = mknodes ? DM_DEVICE_MKNODES : DM_DEVICE_INFO;
if (!(dmt = _setup_task(name, uuid, 0, dmtask))) {
stack;
return 0;
}
@ -320,15 +323,15 @@ static int _info_run(const char *name, const char *uuid, struct dm_info *info,
return r;
}
static int _info(const char *name, const char *uuid, struct dm_info *info,
struct pool *mem, char **uuid_out)
static int _info(const char *name, const char *uuid, int mknodes,
struct dm_info *info, struct pool *mem, char **uuid_out)
{
if (uuid && *uuid && _info_run(NULL, uuid, info, mem, uuid_out)
&& info->exists)
if (!mknodes && uuid && *uuid &&
_info_run(NULL, uuid, info, 0, mem, uuid_out) && info->exists)
return 1;
if (name)
return _info_run(name, NULL, info, mem, uuid_out);
return _info_run(name, NULL, info, mknodes, mem, uuid_out);
return 0;
}
@ -1072,7 +1075,7 @@ void dev_manager_destroy(struct dev_manager *dm)
}
int dev_manager_info(struct dev_manager *dm, const struct logical_volume *lv,
struct dm_info *info)
int mknodes, struct dm_info *info)
{
char *name;
@ -1088,7 +1091,7 @@ int dev_manager_info(struct dev_manager *dm, const struct logical_volume *lv,
* Try and get some info on this device.
*/
log_debug("Getting device info for %s", name);
if (!_info(name, lv->lvid.s, info, NULL, NULL)) {
if (!_info(name, lv->lvid.s, mknodes, info, NULL, NULL)) {
stack;
return 0;
}
@ -1167,7 +1170,7 @@ static struct dev_layer *_create_dev(struct dev_manager *dm, char *name,
dl->name = name;
log_debug("Getting device info for %s", dl->name);
if (!_info(dl->name, dlid, &dl->info, dm->mem, &uuid)) {
if (!_info(dl->name, dlid, 0, &dl->info, dm->mem, &uuid)) {
stack;
return NULL;
}

2
lib/activate/dev_manager.h
View File

@ -28,7 +28,7 @@ void dev_manager_exit(void);
* unsuspended until the snapshot is also created.)
*/
int dev_manager_info(struct dev_manager *dm, const struct logical_volume *lv,
struct dm_info *info);
int mknodes, struct dm_info *info);
int dev_manager_snapshot_percent(struct dev_manager *dm,
struct logical_volume *lv, float *percent);
int dev_manager_mirror_percent(struct dev_manager *dm,