summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNikolay Borisov <nborisov@suse.com>2019-03-27 14:24:15 +0200
committerDavid Sterba <dsterba@suse.com>2019-04-29 19:02:37 +0200
commite74e3993bcf6a1d119a2bbe7af2cc278a147f930 (patch)
treef7956a3b5b0013254f66b0d6723d2ce32300f782 /fs
parent60dfdf25bd31b94d0ed8e0ea50964ff22cc36a87 (diff)
downloadlinux-stable-e74e3993bcf6a1d119a2bbe7af2cc278a147f930.tar.gz
linux-stable-e74e3993bcf6a1d119a2bbe7af2cc278a147f930.tar.bz2
linux-stable-e74e3993bcf6a1d119a2bbe7af2cc278a147f930.zip
btrfs: Factor out in_range macro
This is used in more than one places so let's factor it out in ctree.h. No functional changes. Signed-off-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ctree.h2
-rw-r--r--fs/btrfs/extent-tree.c1
-rw-r--r--fs/btrfs/volumes.c1
3 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 93270e20a8e7..1a6c5ce0cdac 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3806,6 +3806,8 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info)
return signal_pending(current);
}
+#define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len))
+
/* Sanity test specific functions */
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
void btrfs_test_inode_set_ops(struct inode *inode);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 8de4ddef6b1d..7500728bcdd3 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1905,7 +1905,6 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans,
return ret;
}
-#define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len))
static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
u64 *discarded_bytes)
{
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d5e8ac6012ec..7fabbbae3c62 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1505,7 +1505,6 @@ error_bdev_put:
* Try to find a chunk that intersects [start, start + len] range and when one
* such is found, record the end of it in *start
*/
-#define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len))
static bool contains_pending_extent(struct btrfs_device *device, u64 *start,
u64 len)
{