diff options
author | Tony Asleson <tasleson@redhat.com> | 2013-01-08 14:29:56 -0600 |
---|---|---|
committer | Tony Asleson <tasleson@redhat.com> | 2013-07-02 14:24:33 -0500 |
commit | 60c78e6aef9b744d6313ac0cf3ebb62b74066eb3 (patch) | |
tree | 672f3fe4c9d80a9e151e36e91ed98af4af884f17 | |
parent | d52b6be455126e7b6a46c39127ca343982955b19 (diff) | |
download | lvm2-60c78e6aef9b744d6313ac0cf3ebb62b74066eb3.tar.gz |
lvm2app: Move percent_of_extents to lvm-percent.[h|c]
Signed-off-by: Tony Asleson <tasleson@redhat.com>
-rw-r--r-- | lib/misc/lvm-percent.c | 5 | ||||
-rw-r--r-- | lib/misc/lvm-percent.h | 17 | ||||
-rw-r--r-- | tools/toollib.c | 6 | ||||
-rw-r--r-- | tools/tools.h | 16 |
4 files changed, 22 insertions, 22 deletions
diff --git a/lib/misc/lvm-percent.c b/lib/misc/lvm-percent.c index 4b73db481..1dafa57ed 100644 --- a/lib/misc/lvm-percent.c +++ b/lib/misc/lvm-percent.c @@ -38,3 +38,8 @@ percent_t make_percent(uint64_t numerator, uint64_t denominator) } } +uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup) +{ + return (uint32_t)(((uint64_t)percents * (uint64_t)count + + ((roundup) ? 99 : 0)) / 100); +} diff --git a/lib/misc/lvm-percent.h b/lib/misc/lvm-percent.h index bf30a7ef8..ff3de42fa 100644 --- a/lib/misc/lvm-percent.h +++ b/lib/misc/lvm-percent.h @@ -31,6 +31,21 @@ typedef int32_t percent_t; typedef enum { + SIGN_NONE = 0, + SIGN_PLUS = 1, + SIGN_MINUS = 2 +} sign_t; + +typedef enum { + PERCENT_NONE = 0, + PERCENT_VG, + PERCENT_FREE, + PERCENT_LV, + PERCENT_PVS, + PERCENT_ORIGIN +} percent_type_t; + +typedef enum { PERCENT_0 = 0, PERCENT_1 = 1000000, PERCENT_100 = 100 * PERCENT_1, @@ -41,4 +56,6 @@ typedef enum { float percent_to_float(percent_t v); percent_t make_percent(uint64_t numerator, uint64_t denominator); +uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup); + #endif diff --git a/tools/toollib.c b/tools/toollib.c index 46eb86445..6e23e17cc 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1746,9 +1746,3 @@ int change_tag(struct cmd_context *cmd, struct volume_group *vg, return 1; } -/* Return percents of extents and avoid overflow, with optional roundup */ -uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup) -{ - return (uint32_t)(((uint64_t)percents * (uint64_t)count + - ((roundup) ? 99 : 0)) / 100); -} diff --git a/tools/tools.h b/tools/tools.h index 15d1f84fa..6e820bff2 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -74,21 +74,6 @@ enum { #undef arg }; -typedef enum { - SIGN_NONE = 0, - SIGN_PLUS = 1, - SIGN_MINUS = 2 -} sign_t; - -typedef enum { - PERCENT_NONE = 0, - PERCENT_VG, - PERCENT_FREE, - PERCENT_LV, - PERCENT_PVS, - PERCENT_ORIGIN -} percent_type_t; - #define ARG_COUNTABLE 0x00000001 /* E.g. -vvvv */ #define ARG_GROUPABLE 0x00000002 /* E.g. --addtag */ @@ -189,7 +174,6 @@ int lvconvert_poll(struct cmd_context *cmd, struct logical_volume *lv, unsigned int mirror_remove_missing(struct cmd_context *cmd, struct logical_volume *lv, int force); -uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup); int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg, activation_change_t activate); |