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

Zero gap after PV structure on write to disk in order to make non LVM tools happier (AED's idea and patch for LVM1)

Browse Source
This commit is contained in:
Heinz Mauelshagen 2002-01-29 15:52:11 +00:00
parent 6db767961b
commit f7ff4d005f
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/format1/disk-rep.c
View File

@ -5,6 +5,7 @@
*/ */
#include "disk-rep.h" #include "disk-rep.h"
#include "dbg_malloc.h"
#include "pool.h" #include "pool.h"
#include "xlate.h" #include "xlate.h"
#include "log.h" #include "log.h"
@ -169,7 +170,7 @@ static int _read_lvd(struct device *dev, ulong pos, struct lv_disk *disk)
static int _read_vgd(struct disk_list *data) static int _read_vgd(struct disk_list *data)
{ {
struct vg_disk *vgd = &data->vgd; struct vg_disk *vgd = &data->vgd;
unsigned long pos = data->pvd.vg_on_disk.base; ulong pos = data->pvd.vg_on_disk.base;
if (dev_read(data->dev, pos, sizeof(*vgd), vgd) != sizeof(*vgd)) if (dev_read(data->dev, pos, sizeof(*vgd), vgd) != sizeof(*vgd))
fail; fail;
@ -214,7 +215,7 @@ static inline int _check_lvd(struct lv_disk *lvd)
static int _read_lvs(struct disk_list *data) static int _read_lvs(struct disk_list *data)
{ {
int i, read = 0; int i, read = 0;
unsigned long pos; ulong pos;
struct lvd_list *ll; struct lvd_list *ll;
struct vg_disk *vgd = &data->vgd; struct vg_disk *vgd = &data->vgd;
@ -242,7 +243,7 @@ static int _read_extents(struct disk_list *data)
{ {
size_t len = sizeof(struct pe_disk) * data->pvd.pe_total; size_t len = sizeof(struct pe_disk) * data->pvd.pe_total;
struct pe_disk *extents = pool_alloc(data->mem, len); struct pe_disk *extents = pool_alloc(data->mem, len);
unsigned long pos = data->pvd.pe_on_disk.base; ulong pos = data->pvd.pe_on_disk.base;
if (!extents) if (!extents)
fail; fail;
@ -421,7 +422,7 @@ int read_pvs_in_vg(const char *vg_name, struct dev_filter *filter,
static int _write_vgd(struct disk_list *data) static int _write_vgd(struct disk_list *data)
{ {
struct vg_disk *vgd = &data->vgd; struct vg_disk *vgd = &data->vgd;
unsigned long pos = data->pvd.vg_on_disk.base; ulong pos = data->pvd.vg_on_disk.base;
_xlate_vgd(vgd); _xlate_vgd(vgd);
if (dev_write(data->dev, pos, sizeof(*vgd), vgd) != sizeof(*vgd)) if (dev_write(data->dev, pos, sizeof(*vgd), vgd) != sizeof(*vgd))
@ -470,7 +471,7 @@ static int _write_lvd(struct device *dev, ulong pos, struct lv_disk *disk)
static int _write_lvs(struct disk_list *data) static int _write_lvs(struct disk_list *data)
{ {
struct list *lvh; struct list *lvh;
unsigned long pos; ulong pos;
pos = data->pvd.lv_on_disk.base; pos = data->pvd.lv_on_disk.base;
@ -496,7 +497,7 @@ static int _write_extents(struct disk_list *data)
{ {
size_t len = sizeof(struct pe_disk) * data->pvd.pe_total; size_t len = sizeof(struct pe_disk) * data->pvd.pe_total;
struct pe_disk *extents = data->extents; struct pe_disk *extents = data->extents;
unsigned long pos = data->pvd.pe_on_disk.base; ulong pos = data->pvd.pe_on_disk.base;
_xlate_extents(extents, data->pvd.pe_total); _xlate_extents(extents, data->pvd.pe_total);
if (dev_write(data->dev, pos, len, extents) != len) if (dev_write(data->dev, pos, len, extents) != len)
@ -509,14 +510,34 @@ static int _write_extents(struct disk_list *data)
static int _write_pvd(struct disk_list *data) static int _write_pvd(struct disk_list *data)
{ {
struct pv_disk *disk = &data->pvd; char *buf;
ulong pos = data->pvd.pv_on_disk.base;
ulong size = data->pvd.pv_on_disk.size;
_xlate_pvd(disk); if(size < sizeof(struct pv_disk)) {
if (dev_write(data->dev, 0, sizeof(*disk), disk) != sizeof(*disk)) log_err("Invalid PV size.");
return 0;
}
/* Make sure that the gap between the PV structure and
the next one is zeroed in order to make non LVM tools
happy (idea from AED) */
buf = dbg_malloc(size);
if(!buf) {
log_err("Couldn't allocate temporary PV buffer.");
return 0;
}
memset(buf, 0, size);
memcpy(buf, &data->pvd, sizeof(struct pv_disk));
_xlate_pvd((struct pv_disk *)buf);
if (dev_write(data->dev, pos, size, buf) != size) {
dbg_free(buf);
fail; fail;
}
_xlate_pvd(disk); dbg_free(buf);
return 1; return 1;
} }

5
lib/format1/format1.c
View File

@ -401,6 +401,11 @@ static int _pv_write(struct format_instance *fi, struct physical_volume *pv)
goto bad; goto bad;
} }
/* must be set to be able to zero gap after PV structure in
dev_write in order to make other disk tools happy */
dl->pvd.pv_on_disk.base = METADATA_BASE;
dl->pvd.pv_on_disk.size = PV_SIZE;
list_add(&pvs, &dl->list); list_add(&pvs, &dl->list);
if (!write_disks(&pvs)) { if (!write_disks(&pvs)) {
stack; stack;