summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2014-06-05 01:39:19 +0200
committerChris Mason <clm@fb.com>2014-09-17 13:37:16 -0700
commit4e54b17ad67a2d0d59bda6edcf725dc5b281c253 (patch)
treef3bb96ae58a3731de314166e28ba552664ef5859 /fs
parent707e8a071528385a87b63a72a37c2322e463c7b8 (diff)
downloadlinux-stable-4e54b17ad67a2d0d59bda6edcf725dc5b281c253.tar.gz
linux-stable-4e54b17ad67a2d0d59bda6edcf725dc5b281c253.tar.bz2
linux-stable-4e54b17ad67a2d0d59bda6edcf725dc5b281c253.zip
btrfs: clean away stripe_align helper
Only wraps the ALIGN macro. Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent-tree.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index d52da9628f0a..e10555823fde 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6263,14 +6263,6 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root *root,
return ret;
}
-static u64 stripe_align(struct btrfs_root *root,
- struct btrfs_block_group_cache *cache,
- u64 val, u64 num_bytes)
-{
- u64 ret = ALIGN(val, root->stripesize);
- return ret;
-}
-
/*
* when we wait for progress in the block group caching, its because
* our allocation attempt failed at least once. So, we must sleep
@@ -6751,8 +6743,7 @@ unclustered_alloc:
goto loop;
}
checks:
- search_start = stripe_align(root, block_group,
- offset, num_bytes);
+ search_start = ALIGN(offset, root->stripesize);
/* move on to the next group */
if (search_start + num_bytes >