From patchwork Tue Apr 15 16:40:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3993931 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 153549F336 for ; Tue, 15 Apr 2014 15:41:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3392D2022D for ; Tue, 15 Apr 2014 15:41:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 574B920222 for ; Tue, 15 Apr 2014 15:41:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754506AbaDOPlB (ORCPT ); Tue, 15 Apr 2014 11:41:01 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:52980 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754387AbaDOPk7 (ORCPT ); Tue, 15 Apr 2014 11:40:59 -0400 Received: by mail-wg0-f52.google.com with SMTP id k14so9764234wgh.35 for ; Tue, 15 Apr 2014 08:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=/rGH0JYPa1KEGKPVKjmjuVA0F0UbZCPaXGRghFQuyno=; b=Lir8+RUvF8aMxQ/DXwRPuL3g4U7FGWv6PJbMzYZsHr4A/sppMH+hvWCBbbgW63yBJ3 hQ2RXBuCd9kQYWEc9c9/wvUiqKhAFoUdn8nsUxQSuenXu8qXvSY4m1ayhNszYFPeN/DC duuyRWVYtcUiBMNYNwcc7WLiyiSX0fnZOD0FDjcQe5YBogXDvg2vUMq/2pC599UDrScY 58v426fGhvjhbbBDZClzpBpK+VTxE2//h0nJzOPY44ttPd8Tq9eihNFLo7QuHWo8MTgm Bwj775/FkKO4aNfyhoqrLBPeqs4ki62PqryZGu6TUTasgf+5myrwuTkhWM4UtoIe1MHL PQPw== X-Received: by 10.194.191.133 with SMTP id gy5mr2334959wjc.34.1397576458407; Tue, 15 Apr 2014 08:40:58 -0700 (PDT) Received: from debian-vm3.lan (bl10-141-238.dsl.telepac.pt. [85.243.141.238]) by mx.google.com with ESMTPSA id cj9sm30311596wid.1.2014.04.15.08.40.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Apr 2014 08:40:57 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH 1/4] Btrfs-progs: send, bump stream version Date: Tue, 15 Apr 2014 17:40:48 +0100 Message-Id: <1397580051-26643-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This increases the send stream version from version 1 to version 2, adding 2 new commands: 1) total data size - used to tell the receiver how much file data the stream will add or update; 2) fallocate - used to pre-allocate space for files and to punch holes in files. This is preparation work for subsequent changes that implement the new features (computing total data size and use fallocate for better performance). Signed-off-by: Filipe David Borba Manana --- ioctl.h | 8 ++++++++ send.h | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ioctl.h b/ioctl.h index 231660a..901a248 100644 --- a/ioctl.h +++ b/ioctl.h @@ -392,6 +392,14 @@ struct btrfs_ioctl_received_subvol_args { */ #define BTRFS_SEND_FLAG_OMIT_END_CMD 0x4 +/* + * The sum of all length fields the receiver will get in write, clone and + * fallocate commands. + * This can be used by the receiver to compute progress, at the expense of some + * initial metadata scan performed by the sender (kernel). + */ +#define BTRFS_SEND_FLAG_CALCULATE_DATA_SIZE 0x8 + struct btrfs_ioctl_send_args { __s64 send_fd; /* in */ __u64 clone_sources_count; /* in */ diff --git a/send.h b/send.h index e8da785..69e81fb 100644 --- a/send.h +++ b/send.h @@ -24,7 +24,7 @@ extern "C" { #endif #define BTRFS_SEND_STREAM_MAGIC "btrfs-stream" -#define BTRFS_SEND_STREAM_VERSION 1 +#define BTRFS_SEND_STREAM_VERSION 2 #define BTRFS_SEND_BUF_SIZE (1024 * 64) #define BTRFS_SEND_READ_SIZE (1024 * 48) @@ -91,6 +91,11 @@ enum btrfs_send_cmd { BTRFS_SEND_C_END, BTRFS_SEND_C_UPDATE_EXTENT, + + /* added in stream version 2 */ + BTRFS_SEND_C_TOTAL_DATA_SIZE, + BTRFS_SEND_C_FALLOCATE, + __BTRFS_SEND_C_MAX, }; #define BTRFS_SEND_C_MAX (__BTRFS_SEND_C_MAX - 1) @@ -129,10 +134,16 @@ enum { BTRFS_SEND_A_CLONE_OFFSET, BTRFS_SEND_A_CLONE_LEN, + /* added in stream version 2 */ + BTRFS_SEND_A_FALLOCATE_FLAGS, + __BTRFS_SEND_A_MAX, }; #define BTRFS_SEND_A_MAX (__BTRFS_SEND_A_MAX - 1) +#define BTRFS_SEND_A_FALLOCATE_FLAG_KEEP_SIZE (1 << 0) +#define BTRFS_SEND_A_FALLOCATE_FLAG_PUNCH_HOLE (1 << 1) + #ifdef __KERNEL__ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg); #endif