Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs update from Chris Mason:
 "The biggest feature in the pull is the new (and still experimental)
  raid56 code that David Woodhouse started long ago.  I'm still working
  on the parity logging setup that will avoid inconsistent parity after
  a crash, so this is only for testing right now.  But, I'd really like
  to get it out to a broader audience to hammer out any performance
  issues or other problems.

  scrub does not yet correct errors on raid5/6 either.

  Josef has another pass at fsync performance.  The big change here is
  to combine waiting for metadata with waiting for data, which is a big
  latency win.  It is also step one toward using atomics from the
  hardware during a commit.

  Mark Fasheh has a new way to use btrfs send/receive to send only the
  metadata changes.  SUSE is using this to make snapper more efficient
  at finding changes between snapshosts.

  Snapshot-aware defrag is also included.

  Otherwise we have a large number of fixes and cleanups.  Eric Sandeen
  wins the award for removing the most lines, and I'm hoping we steal
  this idea from XFS over and over again."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (118 commits)
  btrfs: fixup/remove module.h usage as required
  Btrfs: delete inline extents when we find them during logging
  btrfs: try harder to allocate raid56 stripe cache
  Btrfs: cleanup to make the function btrfs_delalloc_reserve_metadata more logic
  Btrfs: don't call btrfs_qgroup_free if just btrfs_qgroup_reserve fails
  Btrfs: remove reduplicate check about root in the function btrfs_clean_quota_tree
  Btrfs: return ENOMEM rather than use BUG_ON when btrfs_alloc_path fails
  Btrfs: fix missing deleted items in btrfs_clean_quota_tree
  btrfs: use only inline_pages from extent buffer
  Btrfs: fix wrong reserved space when deleting a snapshot/subvolume
  Btrfs: fix wrong reserved space in qgroup during snap/subv creation
  Btrfs: remove unnecessary dget_parent/dput when creating the pending snapshot
  btrfs: remove a printk from scan_one_device
  Btrfs: fix NULL pointer after aborting a transaction
  Btrfs: fix memory leak of log roots
  Btrfs: copy everything if we've created an inline extent
  btrfs: cleanup for open-coded alignment
  Btrfs: do not change inode flags in rename
  Btrfs: use reserved space for creating a snapshot
  clear chunk_alloc flag on retryable failure
  ...

1 files changed, 46 insertions, 7 deletions

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index f4ab7a9260eb..f7a8b861058b 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -85,6 +85,7 @@ struct send_ctx {
         u32 send_max_size;
         u64 total_send_size;
         u64 cmd_send_size[BTRFS_SEND_C_MAX + 1];
+        u64 flags;      /* 'flags' member of btrfs_ioctl_send_args is u64 */
 
         struct vfsmount *mnt;
 
@@ -3709,6 +3710,39 @@ out:
         return ret;
 }
 
+/*
+ * Send an update extent command to user space.
+ */
+static int send_update_extent(struct send_ctx *sctx,
+                              u64 offset, u32 len)
+{
+        int ret = 0;
+        struct fs_path *p;
+
+        p = fs_path_alloc(sctx);
+        if (!p)
+                return -ENOMEM;
+
+        ret = begin_cmd(sctx, BTRFS_SEND_C_UPDATE_EXTENT);
+        if (ret < 0)
+                goto out;
+
+        ret = get_cur_path(sctx, sctx->cur_ino, sctx->cur_inode_gen, p);
+        if (ret < 0)
+                goto out;
+
+        TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);
+        TLV_PUT_U64(sctx, BTRFS_SEND_A_FILE_OFFSET, offset);
+        TLV_PUT_U64(sctx, BTRFS_SEND_A_SIZE, len);
+
+        ret = send_cmd(sctx);
+
+tlv_put_failure:
+out:
+        fs_path_free(sctx, p);
+        return ret;
+}
+
 static int send_write_or_clone(struct send_ctx *sctx,
                                struct btrfs_path *path,
                                struct btrfs_key *key,
@@ -3744,7 +3778,11 @@ static int send_write_or_clone(struct send_ctx *sctx,
                 goto out;
         }
 
-        if (!clone_root) {
+        if (clone_root) {
+                ret = send_clone(sctx, offset, len, clone_root);
+        } else if (sctx->flags & BTRFS_SEND_FLAG_NO_FILE_DATA) {
+                ret = send_update_extent(sctx, offset, len);
+        } else {
                 while (pos < len) {
                         l = len - pos;
                         if (l > BTRFS_SEND_READ_SIZE)
@@ -3757,10 +3795,7 @@ static int send_write_or_clone(struct send_ctx *sctx,
                         pos += ret;
                 }
                 ret = 0;
-        } else {
-                ret = send_clone(sctx, offset, len, clone_root);
         }
-
 out:
         return ret;
 }
@@ -4536,7 +4571,6 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
         struct btrfs_fs_info *fs_info;
         struct btrfs_ioctl_send_args *arg = NULL;
         struct btrfs_key key;
-        struct file *filp = NULL;
         struct send_ctx *sctx = NULL;
         u32 i;
         u64 *clone_sources_tmp = NULL;
@@ -4561,6 +4595,11 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
                 goto out;
         }
 
+        if (arg->flags & ~BTRFS_SEND_FLAG_NO_FILE_DATA) {
+                ret = -EINVAL;
+                goto out;
+        }
+
         sctx = kzalloc(sizeof(struct send_ctx), GFP_NOFS);
         if (!sctx) {
                 ret = -ENOMEM;
@@ -4572,6 +4611,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
         INIT_RADIX_TREE(&sctx->name_cache, GFP_NOFS);
         INIT_LIST_HEAD(&sctx->name_cache_list);
 
+        sctx->flags = arg->flags;
+
         sctx->send_filp = fget(arg->send_fd);
         if (IS_ERR(sctx->send_filp)) {
                 ret = PTR_ERR(sctx->send_filp);
@@ -4673,8 +4714,6 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
                 goto out;
 
 out:
-        if (filp)
-                fput(filp);
         kfree(arg);
         vfree(clone_sources_tmp);