diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-10-30 11:38:49 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-10-30 23:58:49 +0100 |
| commit | 888b21e9bd10d70154fb361359a2342aa56af27a (patch) | |
| tree | 00bb283a22cffbee68dc93e1f9a41263654d8dbd | |
| parent | 9a6cf3d9f4b43e0d47ac686d8acc5f280d4bfd70 (diff) | |
| download | lvm2-888b21e9bd10d70154fb361359a2342aa56af27a.tar.gz | |
cleanup: extents_from_size is 32bit value
Current lvm2 does support only 32bit extents count.
| -rw-r--r-- | lib/metadata/metadata-exported.h | 2 | ||||
| -rw-r--r-- | lib/metadata/metadata.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 890e808ef..013da1653 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -731,7 +731,7 @@ int lv_rename_update(struct cmd_context *cmd, struct logical_volume *lv, int lv_update_and_reload(struct logical_volume *lv); int lv_update_and_reload_origin(struct logical_volume *lv); -uint64_t extents_from_size(struct cmd_context *cmd, uint64_t size, +uint32_t extents_from_size(struct cmd_context *cmd, uint64_t size, uint32_t extent_size); uint32_t extents_from_percent_size(struct volume_group *vg, const struct dm_list *pvh, uint32_t extents, int roundup, diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 2038f06aa..df2d6a36f 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1075,7 +1075,8 @@ bad: return NULL; } -uint64_t extents_from_size(struct cmd_context *cmd, uint64_t size, +/* Rounds up by default */ +uint32_t extents_from_size(struct cmd_context *cmd, uint64_t size, uint32_t extent_size) { if (size % extent_size) { @@ -1094,7 +1095,7 @@ uint64_t extents_from_size(struct cmd_context *cmd, uint64_t size, return 0; } - return size / extent_size; + return (uint32_t) (size / extent_size); } /* |