From patchwork Sun Apr 20 14:12:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 4021511 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 3D6D49F369 for ; Sun, 20 Apr 2014 13:12:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51DF92021A for ; Sun, 20 Apr 2014 13:12:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5ACF020218 for ; Sun, 20 Apr 2014 13:12:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755411AbaDTNM0 (ORCPT ); Sun, 20 Apr 2014 09:12:26 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:48367 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755321AbaDTNMY (ORCPT ); Sun, 20 Apr 2014 09:12:24 -0400 Received: by mail-wg0-f52.google.com with SMTP id k14so1873436wgh.11 for ; Sun, 20 Apr 2014 06:12:22 -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:in-reply-to:references; bh=7ua+1VdCNI9Pc4R3tdGj3dz1xxMg+K4sc7hEFSMSgQ8=; b=ITO6lEoC0AsWljdrJ0BT0ZNbO0PS2P8QpsYvLnJOhUaWt4/9zcqCdnvKMhIhMCHsHz 5WoEZonHEBKG5+KnAwHpimIsqH04uulBQukmWyGRiH3naz+43v/FqzCCTG6T0iw3WkvS 5d6LpvPkla/v8lK1zq5Zm5g4xRjG/n/WSGDZ/VUnqOK7h8FUOp2jlQywUTSNnqxW4Rwx jDMXaCVsBJoxZRGUiUpvaMOY3WX8rFt2739V6GYI63QKv8801v423psYyabW4HhJHmVc 1oU9209zlKYdIFe3K+mfnWagTjYHHoS0E8cdlWdxBOL8NShBggrt/tVF4T9GxLugANw8 fBZA== X-Received: by 10.194.205.35 with SMTP id ld3mr60149wjc.82.1397999542695; Sun, 20 Apr 2014 06:12:22 -0700 (PDT) Received: from debian-vm3.lan (bl9-92-48.dsl.telepac.pt. [85.242.92.48]) by mx.google.com with ESMTPSA id be3sm52533464wjc.5.2014.04.20.06.12.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 20 Apr 2014 06:12:22 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH 3/4 v4] Btrfs-progs: send, implement fallocate command callback Date: Sun, 20 Apr 2014 15:12:13 +0100 Message-Id: <1398003133-12305-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397580051-26643-3-git-send-email-fdmanana@gmail.com> References: <1397580051-26643-3-git-send-email-fdmanana@gmail.com> 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 The fallocate send stream command, added in stream version 2, is used to pre-allocate space for files and punch file holes. This change implements the callback for that new command, using the fallocate function from the standard C library to carry out the specified action (allocate file space or punch a file hole). Signed-off-by: Filipe David Borba Manana --- V2: Use the new send ioctl flag BTRFS_SEND_FLAG_SUPPORT_FALLOCATE if the user asks for it (-a command line option), which will make the kernel generate a version 2 send stream, so that old clients aren't affected. V3: Rebased on new patchset (new version of patch 2/4). V4: Removed BTRFS_SEND_FLAG_SUPPORT_FALLOCATE flag and -a command line option for btrfs-send. Both were replaced with BTRFS_SEND_FLAG_STREAM_V2 and --stream-version= respectively. Added commands for inode set flags and otime too. cmds-receive.c | 38 ++++++++++++++++++++++++++++++++++++++ send-stream.c | 13 +++++++++++++ send-stream.h | 2 ++ 3 files changed, 53 insertions(+) diff --git a/cmds-receive.c b/cmds-receive.c index bd5255c..5e96423 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "ctree.h" #include "ioctl.h" @@ -887,6 +888,42 @@ out: return ret; } +static int process_fallocate(const char *path, u32 flags, u64 offset, + u64 len, void *user) +{ + struct btrfs_receive *r = user; + char *full_path = path_cat(r->full_subvol_path, path); + int mode = 0; + int ret; + + if (flags & BTRFS_SEND_A_FALLOCATE_FLAG_KEEP_SIZE) + mode |= FALLOC_FL_KEEP_SIZE; + if (flags & BTRFS_SEND_A_FALLOCATE_FLAG_PUNCH_HOLE) + mode |= FALLOC_FL_PUNCH_HOLE; + + if (g_verbose >= 2) + fprintf(stderr, + "fallocate %s - flags %u, offset %llu, len %llu\n", + path, flags, offset, len); + + ret = open_inode_for_write(r, full_path); + if (ret < 0) + goto out; + + ret = fallocate(r->write_fd, mode, offset, len); + if (ret) { + ret = -errno; + fprintf(stderr, + "ERROR: fallocate against %s failed. %s\n", + path, strerror(-ret)); + goto out; + } + update_progress(r, len); + +out: + free(full_path); + return ret; +} static struct btrfs_send_ops send_ops = { .subvol = process_subvol, @@ -910,6 +947,7 @@ static struct btrfs_send_ops send_ops = { .chown = process_chown, .utimes = process_utimes, .total_data_size = process_total_data_size, + .fallocate = process_fallocate, }; static int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd) diff --git a/send-stream.c b/send-stream.c index e1bd4ce..812639f 100644 --- a/send-stream.c +++ b/send-stream.c @@ -425,6 +425,19 @@ static int read_and_process_cmd(struct btrfs_send_stream *s) TLV_GET_U64(s, BTRFS_SEND_A_SIZE, &tmp); ret = s->ops->total_data_size(tmp, s->user); break; + case BTRFS_SEND_C_FALLOCATE: + { + u32 flags; + u64 len; + + TLV_GET_STRING(s, BTRFS_SEND_A_PATH, &path); + TLV_GET_U32(s, BTRFS_SEND_A_FALLOCATE_FLAGS, &flags); + TLV_GET_U64(s, BTRFS_SEND_A_FILE_OFFSET, &offset); + TLV_GET_U64(s, BTRFS_SEND_A_SIZE, &len); + ret = s->ops->fallocate(path, flags, offset, len, + s->user); + } + break; case BTRFS_SEND_C_END: ret = 1; break; diff --git a/send-stream.h b/send-stream.h index 3a653a9..479e40c 100644 --- a/send-stream.h +++ b/send-stream.h @@ -55,6 +55,8 @@ struct btrfs_send_ops { void *user); int (*update_extent)(const char *path, u64 offset, u64 len, void *user); int (*total_data_size)(u64 size, void *user); + int (*fallocate)(const char *path, u32 flags, u64 offset, + u64 len, void *user); }; int btrfs_read_and_process_send_stream(int fd,