btrfs-progs: free-space-cache: Use DIV_ROUND_UP() to replace open code

[platform/upstream/btrfs-progs.git] / free-space-cache.c

diff --git a/free-space-cache.c b/free-space-cache.c
index 4bf4a6c..f933f9f 100644 (file)
--- a/free-space-cache.c
+++ b/free-space-cache.c
@@ -54,8 +54,7 @@ static int io_ctl_init(struct io_ctl *io_ctl, u64 size, u64 ino,
                       struct btrfs_root *root)
 {
        memset(io_ctl, 0, sizeof(struct io_ctl));
-       io_ctl->num_pages = (size + root->fs_info->sectorsize - 1) /
-                               root->fs_info->sectorsize;
+       io_ctl->num_pages = DIV_ROUND_UP(size, root->fs_info->sectorsize);
        io_ctl->buffer = kzalloc(size, GFP_NOFS);
        if (!io_ctl->buffer)
                return -ENOMEM;
@@ -918,7 +917,7 @@ int btrfs_clear_free_space_cache(struct btrfs_fs_info *fs_info,
        slot = path.slots[0];
        sc_header = btrfs_item_ptr(node, slot, struct btrfs_free_space_header);
        btrfs_free_space_key(node, sc_header, &location);
-       ino = location.objectid;
+       ino = btrfs_disk_key_objectid(&location);
 
        /* Delete the free space header, as we have the ino to continue */
        ret = btrfs_del_item(trans, tree_root, &path);