1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-29 15:22:30 +03:00

libdm: don't nest FIEMAP and DMFILEMAPD ifdefs

This commit is contained in:
Bryn M. Reeves 2017-03-09 21:13:51 +00:00
parent af7a11bc57
commit 0104fd6c66

View File

@ -4877,6 +4877,23 @@ out:
dm_free((char *) alias); dm_free((char *) alias);
return NULL; return NULL;
} }
#else /* !HAVE_LINUX_FIEMAP */
uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd,
int group, int precise,
struct dm_histogram *bounds,
const char *alias)
{
log_error("File mapping requires FIEMAP ioctl support.");
return 0;
}
uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd,
uint64_t group_id)
{
log_error("File mapping requires FIEMAP ioctl support.");
return 0;
}
#endif /* HAVE_LINUX_FIEMAP */
#ifdef DMFILEMAPD #ifdef DMFILEMAPD
static const char *_filemapd_mode_names[] = { static const char *_filemapd_mode_names[] = {
@ -5026,32 +5043,6 @@ int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path,
} }
#endif /* DMFILEMAPD */ #endif /* DMFILEMAPD */
#else /* HAVE_LINUX_FIEMAP */
uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd,
int group, int precise,
struct dm_histogram *bounds,
const char *alias)
{
log_error("File mapping requires FIEMAP ioctl support.");
return 0;
}
uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd,
uint64_t group_id)
{
log_error("File mapping requires FIEMAP ioctl support.");
return 0;
}
int dm_stats_start_filemapd(struct dm_stats *dms, int fd, uint64_t group_id,
const char *path)
{
log_error("File mapping requires FIEMAP ioctl support.");
return 0;
}
#endif /* HAVE_LINUX_FIEMAP */
/* /*
* Backward compatible dm_stats_create_region() implementations. * Backward compatible dm_stats_create_region() implementations.
* *