Btrfs: move data checksumming into a dedicated tree

[deliverable/linux.git] / fs / btrfs / ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index d2d5a5a9b026e7d92f57d29fa117ff85ac2b8f0a..6228b69c2b9392c877d7502c4adf7f6290a0a3a1 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -832,7 +832,7 @@ static long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
                slot = path->slots[0];
 
                btrfs_item_key_to_cpu(leaf, &key, slot);
-               if (btrfs_key_type(&key) > BTRFS_CSUM_ITEM_KEY ||
+               if (btrfs_key_type(&key) > BTRFS_EXTENT_DATA_KEY ||
                    key.objectid != src->i_ino)
                        break;
 
@@ -957,56 +957,6 @@ static long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
                        btrfs_mark_buffer_dirty(leaf);
                }
 
-               if (btrfs_key_type(&key) == BTRFS_CSUM_ITEM_KEY) {
-                       u32 size;
-                       struct btrfs_key new_key;
-                       u64 coverslen;
-                       int coff, clen;
-
-                       size = btrfs_item_size_nr(leaf, slot);
-                       coverslen = (size / BTRFS_CRC32_SIZE) <<
-                               root->fs_info->sb->s_blocksize_bits;
-                       printk("csums for %llu~%llu\n",
-                              key.offset, coverslen);
-                       if (key.offset + coverslen < off ||
-                           key.offset >= off+len)
-                               goto next;
-
-                       read_extent_buffer(leaf, buf,
-                                          btrfs_item_ptr_offset(leaf, slot),
-                                          size);
-                       btrfs_release_path(root, path);
-
-                       coff = 0;
-                       if (off > key.offset)
-                               coff = ((off - key.offset) >>
-                                       root->fs_info->sb->s_blocksize_bits) *
-                                       BTRFS_CRC32_SIZE;
-                       clen = size - coff;
-                       if (key.offset + coverslen > off+len)
-                               clen -= ((key.offset+coverslen-off-len) >>
-                                        root->fs_info->sb->s_blocksize_bits) *
-                                       BTRFS_CRC32_SIZE;
-                       printk(" will dup %d~%d of %d\n",
-                              coff, clen, size);
-
-                       memcpy(&new_key, &key, sizeof(new_key));
-                       new_key.objectid = inode->i_ino;
-                       new_key.offset = key.offset + destoff - off;
-
-                       ret = btrfs_insert_empty_item(trans, root, path,
-                                                     &new_key, clen);
-                       if (ret)
-                               goto out;
-
-                       leaf = path->nodes[0];
-                       slot = path->slots[0];
-                       write_extent_buffer(leaf, buf + coff,
-                                           btrfs_item_ptr_offset(leaf, slot),
-                                           clen);
-                       btrfs_mark_buffer_dirty(leaf);
-               }
-
        next:
                btrfs_release_path(root, path);
                key.offset++;
@@ -1035,11 +985,11 @@ out_fput:
        return ret;
 }
 
-static long btrfs_ioctl_clone_range(struct file *file, unsigned long argptr)
+static long btrfs_ioctl_clone_range(struct file *file, void __user *argp)
 {
        struct btrfs_ioctl_clone_range_args args;
 
-       if (copy_from_user(&args, (void *)argptr, sizeof(args)))
+       if (copy_from_user(&args, argp, sizeof(args)))
                return -EFAULT;
        return btrfs_ioctl_clone(file, args.src_fd, args.src_offset,
                                 args.src_length, args.dest_offset);
@@ -1137,7 +1087,7 @@ long btrfs_ioctl(struct file *file, unsigned int
        case BTRFS_IOC_CLONE:
                return btrfs_ioctl_clone(file, arg, 0, 0, 0);
        case BTRFS_IOC_CLONE_RANGE:
-               return btrfs_ioctl_clone_range(file, arg);
+               return btrfs_ioctl_clone_range(file, argp);
        case BTRFS_IOC_TRANS_START:
                return btrfs_ioctl_trans_start(file);
        case BTRFS_IOC_TRANS_END: