openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: move math functions to misc.h 

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2019-08-21 18:54:28 +02:00
parent 602cbe91fb
commit 784352fe0b
7 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/block-group.c
View File

@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "misc.h"
#include "ctree.h" #include "ctree.h"
#include "block-group.h" #include "block-group.h"
#include "space-info.h" #include "space-info.h"
@ -13,7 +14,6 @@
#include "sysfs.h" #include "sysfs.h"
#include "tree-log.h" #include "tree-log.h"
#include "delalloc-space.h" #include "delalloc-space.h"
#include "math.h"
/* /*
* Return target flags in extended format or 0 if restripe for this chunk_type * Return target flags in extended format or 0 if restripe for this chunk_type

2
fs/btrfs/block-rsv.c
View File

@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "misc.h"
#include "ctree.h" #include "ctree.h"
#include "block-rsv.h" #include "block-rsv.h"
#include "space-info.h" #include "space-info.h"
#include "math.h"
#include "transaction.h" #include "transaction.h"
static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info, static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,

1
fs/btrfs/extent-tree.c
View File

@ -25,7 +25,6 @@
#include "locking.h" #include "locking.h"
#include "free-space-cache.h" #include "free-space-cache.h"
#include "free-space-tree.h" #include "free-space-tree.h"
#include "math.h"
#include "sysfs.h" #include "sysfs.h"
#include "qgroup.h" #include "qgroup.h"
#include "ref-verify.h" #include "ref-verify.h"

28
fs/btrfs/math.h
View File

@ -1,28 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2012 Fujitsu. All rights reserved.
* Written by Miao Xie <miaox@cn.fujitsu.com>
*/
#ifndef BTRFS_MATH_H
#define BTRFS_MATH_H
#include <asm/div64.h>
static inline u64 div_factor(u64 num, int factor)
{
if (factor == 10)
return num;
num *= factor;
return div_u64(num, 10);
}
static inline u64 div_factor_fine(u64 num, int factor)
{
if (factor == 100)
return num;
num *= factor;
return div_u64(num, 100);
}
#endif

17
fs/btrfs/misc.h
View File

@ -5,6 +5,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/div64.h>
#define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len)) #define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len))
@ -30,4 +31,20 @@ static inline void cond_wake_up_nomb(struct wait_queue_head *wq)
wake_up(wq); wake_up(wq);
} }
static inline u64 div_factor(u64 num, int factor)
{
if (factor == 10)
return num;
num *= factor;
return div_u64(num, 10);
}
static inline u64 div_factor_fine(u64 num, int factor)
{
if (factor == 100)
return num;
num *= factor;
return div_u64(num, 100);
}
#endif #endif

2
fs/btrfs/space-info.c
View File

@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "misc.h"
#include "ctree.h" #include "ctree.h"
#include "space-info.h" #include "space-info.h"
#include "sysfs.h" #include "sysfs.h"
@ -7,7 +8,6 @@
#include "free-space-cache.h" #include "free-space-cache.h"
#include "ordered-data.h" #include "ordered-data.h"
#include "transaction.h" #include "transaction.h"
#include "math.h"
#include "block-group.h" #include "block-group.h"
u64 btrfs_space_info_used(struct btrfs_space_info *s_info, u64 btrfs_space_info_used(struct btrfs_space_info *s_info,

2
fs/btrfs/volumes.c
View File

@ -14,6 +14,7 @@
#include <linux/semaphore.h> #include <linux/semaphore.h>
#include <linux/uuid.h> #include <linux/uuid.h>
#include <linux/list_sort.h> #include <linux/list_sort.h>
#include "misc.h"
#include "ctree.h" #include "ctree.h"
#include "extent_map.h" #include "extent_map.h"
#include "disk-io.h" #include "disk-io.h"
@ -24,7 +25,6 @@
#include "async-thread.h" #include "async-thread.h"
#include "check-integrity.h" #include "check-integrity.h"
#include "rcu-string.h" #include "rcu-string.h"
#include "math.h"
#include "dev-replace.h" #include "dev-replace.h"
#include "sysfs.h" #include "sysfs.h"
#include "tree-checker.h" #include "tree-checker.h"