shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

format_text: Supply mempool directly to raw_read_mda_header.

Browse Source
This commit is contained in:
Alasdair G Kergon 2017-12-15 14:57:05 +00:00
parent 83e1a0bad8
commit 145ded10c2
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/format_text/format-text.c
View File

@ -196,7 +196,7 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt,
if (!dev_open_readonly(area->dev)) if (!dev_open_readonly(area->dev))
return_0; return_0;
if (!(mdah = raw_read_mda_header(fmt, area, mda_is_primary(mda)))) if (!(mdah = raw_read_mda_header(fmt->cmd->mem, area, mda_is_primary(mda))))
goto_out; goto_out;
rlocn = mdah->raw_locns; rlocn = mdah->raw_locns;
@ -370,18 +370,17 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev
return 1; return 1;
} }
struct mda_header *raw_read_mda_header(const struct format_type *fmt, struct mda_header *raw_read_mda_header(struct dm_pool *mem, struct device_area *dev_area, int primary_mda)
struct device_area *dev_area, int primary_mda)
{ {
struct mda_header *mdah; struct mda_header *mdah;
if (!(mdah = dm_pool_alloc(fmt->cmd->mem, MDA_HEADER_SIZE))) { if (!(mdah = dm_pool_alloc(mem, MDA_HEADER_SIZE))) {
log_error("struct mda_header allocation failed"); log_error("struct mda_header allocation failed");
return NULL; return NULL;
} }
if (!_raw_read_mda_header(mdah, dev_area, primary_mda)) { if (!_raw_read_mda_header(mdah, dev_area, primary_mda)) {
dm_pool_free(fmt->cmd->mem, mdah); dm_pool_free(mem, mdah);
return NULL; return NULL;
} }
@ -529,7 +528,7 @@ static int _raw_holds_vgname(struct format_instance *fid,
if (!dev_open_readonly(dev_area->dev)) if (!dev_open_readonly(dev_area->dev))
return_0; return_0;
if (!(mdah = raw_read_mda_header(fid->fmt, dev_area, 0))) if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, dev_area, 0)))
return_0; return_0;
if (_find_vg_rlocn(dev_area, mdah, 0, vgname, &noprecommit)) if (_find_vg_rlocn(dev_area, mdah, 0, vgname, &noprecommit))
@ -556,7 +555,7 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid,
char *desc; char *desc;
uint32_t wrap = 0; uint32_t wrap = 0;
if (!(mdah = raw_read_mda_header(fid->fmt, area, primary_mda))) if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, area, primary_mda)))
goto_out; goto_out;
if (!(rlocn = _find_vg_rlocn(area, mdah, primary_mda, vgname, &precommitted))) { if (!(rlocn = _find_vg_rlocn(area, mdah, primary_mda, vgname, &precommitted))) {
@ -733,7 +732,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg,
if (!dev_open(mdac->area.dev)) if (!dev_open(mdac->area.dev))
return_0; return_0;
if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, &mdac->area, mda_is_primary(mda))))
goto_out; goto_out;
/* Following space is zero-filled up to the next MDA_ALIGNMENT boundary */ /* Following space is zero-filled up to the next MDA_ALIGNMENT boundary */
@ -865,7 +864,7 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid,
if (!found) if (!found)
return 1; return 1;
if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, &mdac->area, mda_is_primary(mda))))
goto_out; goto_out;
if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit))) { if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit))) {
@ -985,7 +984,7 @@ static int _vg_remove_raw(struct format_instance *fid, struct volume_group *vg,
if (!dev_open(mdac->area.dev)) if (!dev_open(mdac->area.dev))
return_0; return_0;
if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, &mdac->area, mda_is_primary(mda))))
goto_out; goto_out;
if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), vg->name, &noprecommit))) { if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), vg->name, &noprecommit))) {
@ -1414,7 +1413,7 @@ static int _scan_raw(const struct format_type *fmt, const char *vgname __attribu
continue; continue;
} }
if (!(mdah = raw_read_mda_header(fmt, &rl->dev_area, 0))) { if (!(mdah = raw_read_mda_header(fmt->cmd->mem, &rl->dev_area, 0))) {
stack; stack;
goto close_dev; goto close_dev;
} }

3
lib/format_text/layout.h
View File

@ -81,8 +81,7 @@ struct mda_header {
struct raw_locn raw_locns[0]; /* NULL-terminated list */ struct raw_locn raw_locns[0]; /* NULL-terminated list */
} __attribute__ ((packed)); } __attribute__ ((packed));
struct mda_header *raw_read_mda_header(const struct format_type *fmt, struct mda_header *raw_read_mda_header(struct dm_pool *mem, struct device_area *dev_area, int primary_mda);
struct device_area *dev_area, int primary_mda);
struct mda_lists { struct mda_lists {
struct dm_list dirs; struct dm_list dirs;

3
lib/format_text/text_label.c
View File

@ -19,6 +19,7 @@
#include "label.h" #include "label.h"
#include "xlate.h" #include "xlate.h"
#include "lvmcache.h" #include "lvmcache.h"
#include "toolcontext.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@ -344,7 +345,7 @@ static int _update_mda(struct metadata_area *mda, void *baton)
return 1; return 1;
} }
if (!(mdah = raw_read_mda_header(fmt, &mdac->area, mda_is_primary(mda)))) { if (!(mdah = raw_read_mda_header(fmt->cmd->mem, &mdac->area, mda_is_primary(mda)))) {
stack; stack;
goto close_dev; goto close_dev;
} }