Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / fs / btrfs / free-space-cache.c

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d468bfd..8f835bf 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -30,7 +30,7 @@
 #include "volumes.h"
 
 #define BITS_PER_BITMAP                (PAGE_CACHE_SIZE * 8)
-#define MAX_CACHE_BYTES_PER_GIG        (32 * 1024)
+#define MAX_CACHE_BYTES_PER_GIG        SZ_32K
 
 struct btrfs_trim_range {
        u64 start;
@@ -1086,14 +1086,11 @@ write_pinned_extent_entries(struct btrfs_root *root,
 static noinline_for_stack int
 write_bitmap_entries(struct btrfs_io_ctl *io_ctl, struct list_head *bitmap_list)
 {
-       struct list_head *pos, *n;
+       struct btrfs_free_space *entry, *next;
        int ret;
 
        /* Write out the bitmaps */
-       list_for_each_safe(pos, n, bitmap_list) {
-               struct btrfs_free_space *entry =
-                       list_entry(pos, struct btrfs_free_space, list);
-
+       list_for_each_entry_safe(entry, next, bitmap_list, list) {
                ret = io_ctl_add_bitmap(io_ctl, entry->bitmap);
                if (ret)
                        return -ENOSPC;
@@ -1119,13 +1116,10 @@ static int flush_dirty_cache(struct inode *inode)
 static void noinline_for_stack
 cleanup_bitmap_list(struct list_head *bitmap_list)
 {
-       struct list_head *pos, *n;
+       struct btrfs_free_space *entry, *next;
 
-       list_for_each_safe(pos, n, bitmap_list) {
-               struct btrfs_free_space *entry =
-                       list_entry(pos, struct btrfs_free_space, list);
+       list_for_each_entry_safe(entry, next, bitmap_list, list)
                list_del_init(&entry->list);
-       }
 }
 
 static void noinline_for_stack
@@ -1656,11 +1650,10 @@ static void recalculate_thresholds(struct btrfs_free_space_ctl *ctl)
         * at or below 32k, so we need to adjust how much memory we allow to be
         * used by extent based free space tracking
         */
-       if (size < 1024 * 1024 * 1024)
+       if (size < SZ_1G)
                max_bytes = MAX_CACHE_BYTES_PER_GIG;
        else
-               max_bytes = MAX_CACHE_BYTES_PER_GIG *
-                       div_u64(size, 1024 * 1024 * 1024);
+               max_bytes = MAX_CACHE_BYTES_PER_GIG * div_u64(size, SZ_1G);
 
        /*
         * we want to account for 1 more bitmap than what we have so we can make
@@ -2489,8 +2482,7 @@ void btrfs_init_free_space_ctl(struct btrfs_block_group_cache *block_group)
         * track of free space, and if we pass 1/2 of that we want to
         * start converting things over to using bitmaps
         */
-       ctl->extents_thresh = ((1024 * 32) / 2) /
-                               sizeof(struct btrfs_free_space);
+       ctl->extents_thresh = (SZ_32K / 2) / sizeof(struct btrfs_free_space);
 }
 
 /*