From 3f22699030464fd69e108b3bd8373cf634bacb77 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 19 Dec 2014 15:31:00 +0100 Subject: [PATCH] btrfs-progs: move contents of math.h to utils.h and delete Signed-off-by: David Sterba --- math.h | 33 --------------------------------- utils.h | 9 +++++++++ volumes.c | 2 +- 3 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 math.h diff --git a/math.h b/math.h deleted file mode 100644 index 0c161045..00000000 --- a/math.h +++ /dev/null @@ -1,33 +0,0 @@ - -/* - * Copyright (C) 2012 FUJITSU LIMITED. All rights reserved. - * Written by Miao Xie - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License v2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. - */ - -#ifndef __BTRFS_MATH_H -#define __BTRFS_MATH_H - -static inline u64 div_factor(u64 num, int factor) -{ - if (factor == 10) - return num; - num *= factor; - num /= 10; - return num; -} - -#endif diff --git a/utils.h b/utils.h index 34fd5e4e..2480a212 100644 --- a/utils.h +++ b/utils.h @@ -190,6 +190,15 @@ static inline int count_digits(u64 num) return ret; } +static inline u64 div_factor(u64 num, int factor) +{ + if (factor == 10) + return num; + num *= factor; + num /= 10; + return num; +} + int btrfs_tree_search2_ioctl_supported(int fd); #endif diff --git a/volumes.c b/volumes.c index a988cdbc..5ba5db5d 100644 --- a/volumes.c +++ b/volumes.c @@ -29,7 +29,7 @@ #include "transaction.h" #include "print-tree.h" #include "volumes.h" -#include "math.h" +#include "utils.h" struct stripe { struct btrfs_device *dev;