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

o add munging for format1 and 2

Browse Source
This commit is contained in:
Joe Thornber 2001-10-10 09:36:29 +00:00
parent 755590409e
commit 6320fd9e52
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,6 @@ static void _xlate_pv(struct pv_disk *disk)
xx32(pe_total); xx32(pe_total);
xx32(pe_allocated); xx32(pe_allocated);
xx32(pe_start); xx32(pe_start);
/* FIXME: put v1, v2 munging in here. */
} }
static void _xlate_lv(struct lv_disk *disk) static void _xlate_lv(struct lv_disk *disk)
@ -95,14 +93,41 @@ static void _xlate_extents(struct pe_disk *extents, int count)
} }
} }
/*
* Handle both minor metadata formats.
*/
static int _munge_formats(struct pv_disk *pvd)
{
uint32_t pe_start;
switch (pvd->version) {
case 1:
pe_start = (pvd->pe_on_disk.base + pvd->pe_on_disk.size) /
SECTOR_SIZE;
break;
case 2:
pvd->version = 1;
pe_start = pvd->pe_start * SECTOR_SIZE;
pvd->pe_on_disk.size = pe_start - pvd->pe_on_disk.base;
break;
default:
log_err("unknown metadata version %d", pvd->version);
return 0;
}
return 1;
}
static int _read_pv(struct disk_list *data) static int _read_pv(struct disk_list *data)
{ {
struct pv_disk *pvd = &data->pv; struct pv_disk *pvd = &data->pv;
if (dev_read(data->dev, 0, sizeof(*pvd), pvd) != sizeof(*pvd)) if (dev_read(data->dev, 0, sizeof(*pvd), pvd) != sizeof(*pvd))
fail; fail;
_xlate_pv(pvd); _xlate_pv(pvd);
return 1;
return _munge_formats(pvd);
} }
static int _read_lv(struct device *dev, ulong pos, struct lv_disk *disk) static int _read_lv(struct device *dev, ulong pos, struct lv_disk *disk)

3
lib/format1/disk-rep.h
View File

@ -11,6 +11,9 @@
#include "metadata.h" #include "metadata.h"
#include "pool.h" #include "pool.h"
#define SECTOR_SIZE 512
#define MAX_PV 256 #define MAX_PV 256
#define MAX_LV 256 #define MAX_LV 256
#define MAX_VG 99 #define MAX_VG 99

2
lib/format1/layout.c
View File

@ -8,8 +8,6 @@
#include "log.h" #include "log.h"
#define SECTOR_SIZE 512
/* /*
* Only works with powers of 2. * Only works with powers of 2.
*/ */