| Message ID | 20190211083510.27591-10-nborisov@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | FITRIM improvements | expand |
On Mon, Feb 11, 2019 at 10:35:07AM +0200, Nikolay Borisov wrote: > 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> > --- > fs/btrfs/ctree.h | 2 ++ > fs/btrfs/extent-tree.c | 1 - > fs/btrfs/volumes.c | 1 - > 3 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index 86dbf2160ae2..c61fff4c294d 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -3808,6 +3808,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)) I think it's time to add a new file for such small helpers and not clutter ctree.h. There's math.h but too specific (and we did object against that back then but, well). Something like utils.h or common.h would be good, with eg. the assert macros or cond_wake_mb, and the math helpers too. That's for later and does not affect this patchet.
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 86dbf2160ae2..c61fff4c294d 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3808,6 +3808,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 39647ddb2195..188774ed7795 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 ece4e5fad9c6..6fd8df6e3964 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1515,7 +1515,6 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, fmode_t flags, * Tries to find a chunk that intersects [start, start +len] range and when one * such is found, records 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) {
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> --- fs/btrfs/ctree.h | 2 ++ fs/btrfs/extent-tree.c | 1 - fs/btrfs/volumes.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-)