Merge tag 'pm-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux-2.6-microblaze.git] / fs / btrfs / send.c

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 78a3537..8f32385 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -1191,9 +1191,6 @@ struct backref_ctx {
        /* may be truncated in case it's the last extent in a file */
        u64 extent_len;
 
-       /* data offset in the file extent item */
-       u64 data_offset;
-
        /* Just to check for bugs in backref resolving */
        int found_itself;
 };
@@ -1401,19 +1398,6 @@ static int find_extent_clone(struct send_ctx *sctx,
        backref_ctx->cur_offset = data_offset;
        backref_ctx->found_itself = 0;
        backref_ctx->extent_len = num_bytes;
-       /*
-        * For non-compressed extents iterate_extent_inodes() gives us extent
-        * offsets that already take into account the data offset, but not for
-        * compressed extents, since the offset is logical and not relative to
-        * the physical extent locations. We must take this into account to
-        * avoid sending clone offsets that go beyond the source file's size,
-        * which would result in the clone ioctl failing with -EINVAL on the
-        * receiving end.
-        */
-       if (compressed == BTRFS_COMPRESS_NONE)
-               backref_ctx->data_offset = 0;
-       else
-               backref_ctx->data_offset = btrfs_file_extent_offset(eb, fi);
 
        /*
         * The last extent of a file may be too large due to page alignment.
@@ -4948,7 +4932,6 @@ static int put_file_data(struct send_ctx *sctx, u64 offset, u32 len)
        struct btrfs_fs_info *fs_info = root->fs_info;
        struct inode *inode;
        struct page *page;
-       char *addr;
        pgoff_t index = offset >> PAGE_SHIFT;
        pgoff_t last_index;
        unsigned pg_offset = offset_in_page(offset);
@@ -5001,10 +4984,8 @@ static int put_file_data(struct send_ctx *sctx, u64 offset, u32 len)
                        }
                }
 
-               addr = kmap(page);
-               memcpy(sctx->send_buf + sctx->send_size, addr + pg_offset,
-                      cur_len);
-               kunmap(page);
+               memcpy_from_page(sctx->send_buf + sctx->send_size, page,
+                                pg_offset, cur_len);
                unlock_page(page);
                put_page(page);
                index++;
@@ -6607,10 +6588,9 @@ static int changed_cb(struct btrfs_path *left_path,
                      struct btrfs_path *right_path,
                      struct btrfs_key *key,
                      enum btrfs_compare_tree_result result,
-                     void *ctx)
+                     struct send_ctx *sctx)
 {
        int ret = 0;
-       struct send_ctx *sctx = ctx;
 
        if (result == BTRFS_COMPARE_TREE_SAME) {
                if (key->type == BTRFS_INODE_REF_KEY ||
@@ -6815,7 +6795,7 @@ static int tree_compare_item(struct btrfs_path *left_path,
  * If it detects a change, it aborts immediately.
  */
 static int btrfs_compare_trees(struct btrfs_root *left_root,
-                       struct btrfs_root *right_root, void *ctx)
+                       struct btrfs_root *right_root, struct send_ctx *sctx)
 {
        struct btrfs_fs_info *fs_info = left_root->fs_info;
        int ret;
@@ -6967,7 +6947,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                ret = changed_cb(left_path, right_path,
                                                &right_key,
                                                BTRFS_COMPARE_TREE_DELETED,
-                                               ctx);
+                                               sctx);
                                if (ret < 0)
                                        goto out;
                        }
@@ -6978,7 +6958,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                ret = changed_cb(left_path, right_path,
                                                &left_key,
                                                BTRFS_COMPARE_TREE_NEW,
-                                               ctx);
+                                               sctx);
                                if (ret < 0)
                                        goto out;
                        }
@@ -6992,7 +6972,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                ret = changed_cb(left_path, right_path,
                                                &left_key,
                                                BTRFS_COMPARE_TREE_NEW,
-                                               ctx);
+                                               sctx);
                                if (ret < 0)
                                        goto out;
                                advance_left = ADVANCE;
@@ -7000,7 +6980,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                ret = changed_cb(left_path, right_path,
                                                &right_key,
                                                BTRFS_COMPARE_TREE_DELETED,
-                                               ctx);
+                                               sctx);
                                if (ret < 0)
                                        goto out;
                                advance_right = ADVANCE;
@@ -7015,7 +6995,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                else
                                        result = BTRFS_COMPARE_TREE_SAME;
                                ret = changed_cb(left_path, right_path,
-                                                &left_key, result, ctx);
+                                                &left_key, result, sctx);
                                if (ret < 0)
                                        goto out;
                                advance_left = ADVANCE;