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

device: Merge _dev_read and dev_read_callback.

Browse Source
This commit is contained in:
Alasdair G Kergon 2018-01-16 00:41:42 +00:00
parent 0a3c6bf8c6
commit 081902b4c1
2 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/device/dev-io.c
View File

@ -791,20 +791,26 @@ static void _dev_inc_error_count(struct device *dev)
/*
* Data is returned (read-only) at DEV_DEVBUF_DATA(dev, reason)
*/
static int _dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason)
int dev_read_callback(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason,
lvm_callback_fn_t dev_read_callback_fn, void *callback_context)
{
struct device_area where;
struct device_buffer *devbuf;
uint64_t buf_end;
int ret;
int cached = 0;
int ret = 1;
if (!dev->open_count) {
log_error(INTERNAL_ERROR "Attempt to access device %s while closed.", dev_name(dev));
return 0;
ret = 0;
goto out;
}
if (!_dev_is_valid(dev))
return 0;
if (!_dev_is_valid(dev)) {
log_error("Not reading from %s - too many errors.", dev_name(dev));
ret = 0;
goto out;
}
/*
* Can we satisfy this from data we stored last time we read?
@ -813,10 +819,11 @@ static int _dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_rea
buf_end = devbuf->where.start + devbuf->where.size - 1;
if (offset >= devbuf->where.start && offset <= buf_end && offset + len - 1 <= buf_end) {
/* Reuse this buffer */
cached = 1;
devbuf->data_offset = offset - devbuf->where.start;
log_debug_io("Cached read for %" PRIu64 " bytes at %" PRIu64 " on %s (for %s)",
(uint64_t) len, (uint64_t) offset, dev_name(dev), _reason_text(reason));
return 1;
goto out;
}
}
@ -825,8 +832,14 @@ static int _dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_rea
where.size = len;
ret = _aligned_io(&where, NULL, 0, reason);
if (!ret)
if (!ret) {
log_error("Read from %s failed.", dev_name(dev));
_dev_inc_error_count(dev);
}
out:
if (dev_read_callback_fn)
dev_read_callback_fn(!ret, callback_context, DEV_DEVBUF_DATA(dev, reason));
return ret;
}
@ -834,41 +847,17 @@ static int _dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_rea
/* Returns pointer to read-only buffer. Caller does not free it. */
const char *dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason)
{
if (!_dev_read(dev, offset, len, reason)) {
log_error("Read from %s failed", dev_name(dev));
return NULL;
}
if (!dev_read_callback(dev, offset, len, reason, NULL, NULL))
return_NULL;
return DEV_DEVBUF_DATA(dev, reason);
}
/* Obtains data requested then passes it (read-only) to dev_read_callback_fn() */
int dev_read_callback(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason,
lvm_callback_fn_t dev_read_callback_fn, void *callback_context)
{
int r = 0;
if (!_dev_read(dev, offset, len, reason)) {
log_error("Read from %s failed", dev_name(dev));
goto out;
}
r = 1;
out:
if (dev_read_callback_fn)
dev_read_callback_fn(!r, callback_context, DEV_DEVBUF_DATA(dev, reason));
return r;
}
/* Read into supplied retbuf owned by the caller. */
int dev_read_buf(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *retbuf)
{
if (!_dev_read(dev, offset, len, reason)) {
log_error("Read from %s failed", dev_name(dev));
return 0;
}
if (!dev_read_callback(dev, offset, len, reason, NULL, NULL))
return_0;
memcpy(retbuf, DEV_DEVBUF_DATA(dev, reason), len);

2
lib/format1/lvm1-label.c
View File

@ -64,7 +64,7 @@ static int _lvm1_read(struct labeller *l, struct device *dev, void *buf,
const char *vgid = FMT_LVM1_ORPHAN_VG_NAME;
const char *vgname = FMT_LVM1_ORPHAN_VG_NAME;
unsigned exported = 0;
int r;
int r = 0;
munge_pvd(dev, pvd);