btrfs: use copy_page for copying pages instead of memcpy

[sfrench/cifs-2.6.git] / fs / btrfs / free-space-cache.c

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d5f80cb300bea03a2a417fd5cc03d55c960f8314..57e7ab7f5e03c310a45290f63dd0567c523bb6e7 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -300,9 +300,9 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,
        if (btrfs_ino(BTRFS_I(inode)) != BTRFS_FREE_INO_OBJECTID)
                check_crcs = 1;
 
-       /* Make sure we can fit our crcs into the first page */
+       /* Make sure we can fit our crcs and generation into the first page */
        if (write && check_crcs &&
-           (num_pages * sizeof(u32)) >= PAGE_SIZE)
+           (num_pages * sizeof(u32) + sizeof(u64)) > PAGE_SIZE)
                return -ENOSPC;
 
        memset(io_ctl, 0, sizeof(struct btrfs_io_ctl));
@@ -547,7 +547,7 @@ static int io_ctl_add_bitmap(struct btrfs_io_ctl *io_ctl, void *bitmap)
                io_ctl_map_page(io_ctl, 0);
        }
 
-       memcpy(io_ctl->cur, bitmap, PAGE_SIZE);
+       copy_page(io_ctl->cur, bitmap);
        io_ctl_set_crc(io_ctl, io_ctl->index - 1);
        if (io_ctl->index < io_ctl->num_pages)
                io_ctl_map_page(io_ctl, 0);
@@ -607,7 +607,7 @@ static int io_ctl_read_bitmap(struct btrfs_io_ctl *io_ctl,
        if (ret)
                return ret;
 
-       memcpy(entry->bitmap, io_ctl->cur, PAGE_SIZE);
+       copy_page(entry->bitmap, io_ctl->cur);
        io_ctl_unmap_page(io_ctl);
 
        return 0;
@@ -655,7 +655,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
                                   struct btrfs_free_space_ctl *ctl,
                                   struct btrfs_path *path, u64 offset)
 {
-       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_free_space_header *header;
        struct extent_buffer *leaf;
        struct btrfs_io_ctl io_ctl;
@@ -1123,13 +1123,10 @@ static int __btrfs_wait_cache_io(struct btrfs_root *root,
 {
        int ret;
        struct inode *inode = io_ctl->inode;
-       struct btrfs_fs_info *fs_info;
 
        if (!inode)
                return 0;
 
-       fs_info = btrfs_sb(inode->i_sb);
-
        /* Flush the dirty pages in the cache file. */
        ret = flush_dirty_cache(inode);
        if (ret)
@@ -1145,7 +1142,7 @@ out:
                BTRFS_I(inode)->generation = 0;
                if (block_group) {
 #ifdef DEBUG
-                       btrfs_err(fs_info,
+                       btrfs_err(root->fs_info,
                                  "failed to write free space cache for block group %llu",
                                  block_group->key.objectid);
 #endif