From patchwork Fri Jan 22 20:47:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 12040583 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38E5EC433DB for ; Fri, 22 Jan 2021 21:09:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07B2923A7A for ; Fri, 22 Jan 2021 21:09:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727517AbhAVVIu (ORCPT ); Fri, 22 Jan 2021 16:08:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731092AbhAVUxj (ORCPT ); Fri, 22 Jan 2021 15:53:39 -0500 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DD36C0698D6 for ; Fri, 22 Jan 2021 12:48:49 -0800 (PST) Received: by mail-pl1-x633.google.com with SMTP id s15so3965454plr.9 for ; Fri, 22 Jan 2021 12:48:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vluC4QsiHSkyry2xzC2VIhFrn1+Np2hmZb2mivQ1YTg=; b=RYRwooaVlDLl3ffkD0Wu+YBn1ROm6XyzduKrLEbtNxU5eNHa5xaJcqVMNZKgHosTIM cyqgYxDts1Y/48+aIQGujGonEZgWPouyOUYbXLRt3hRxme13PZ64P4vT0SgnbVagb0zG q7d85JpAhRsY0W9s1IoU5VnBFMydqQ72wRmZtR5Cullk+7+BduMipAzYpzArHwlU+Jrm jGoGpAeKkQGqTMbXC4dS4lcjvLLbliM2gAyRivOIhbyMc++Osz45zJ58X7uxJqMlHZra ckUUOvy6QimaHRZZhJc/16u5CqSGFq5jbXJWuKguFrgYmKcMMsQINC8UbtuDMiCTOo2X ebKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vluC4QsiHSkyry2xzC2VIhFrn1+Np2hmZb2mivQ1YTg=; b=Q2UTxdHMTjiO99N94pkEHwTZvqEjo2ZaLEsVool7ttdXylw8N+LbdKzqXrBCwRwIzk t/xw0qCJ+fL7tzw8dvVPaqYemMjZC6K4hQ76EFNsGPAKGyBeJ2VtmAq6/Kc0cTUcp6J5 1olLKhoTn5K4sB1UQwOAvPZlXtbbX9CCZ/ZjjbSyONqqLEDcQQ7Q33wO1KH6oIqOyY4W KyCC4InBWB5fgAQbP2i0WVrywr/R55UFUpto10khklChT2avL2WUwIKy+YjeExs0vz1R z/gwZNoTWOOfFpf0+jSNrap8WY+TjHZaCPmwHGCcBqtjvg5OMrYIPyoSLYLbVdVPbn5p Bu5g== X-Gm-Message-State: AOAM533hSZUvp/f5nZvdH86XCosx1fqkgTobuhgVdK6a7IqNkhGpTHrt +ysN+FF2g6tyzEGyRECRgFb/Nw== X-Google-Smtp-Source: ABdhPJxLSpX4ZzM5XqGc3wAgGKyyULQDkTsSEzp8+3tDlXR8KYC4WLEFHqByg4eRCdG2cRx6R2xpzg== X-Received: by 2002:a17:90b:1489:: with SMTP id js9mr7587958pjb.13.1611348528931; Fri, 22 Jan 2021 12:48:48 -0800 (PST) Received: from relinquished.tfbnw.net ([2620:10d:c090:400::5:ea88]) by smtp.gmail.com with ESMTPSA id y16sm9865617pfb.83.2021.01.22.12.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:48:47 -0800 (PST) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v3 08/11] btrfs-progs: receive: process fallocate commands Date: Fri, 22 Jan 2021 12:47:55 -0800 Message-Id: <56247ebadeed72747e5ea3db075a26e831419188.1611347859.git.osandov@osandov.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Boris Burkov Send stream v2 can emit fallocate commands, so receive must support them as well. The implementation simply passes along the arguments to the syscall. Note that mode is encoded as a u32 in send stream but fallocate takes an int, so there is a unsigned->signed conversion there. Signed-off-by: Boris Burkov --- cmds/receive-dump.c | 9 +++++++++ cmds/receive.c | 25 +++++++++++++++++++++++++ common/send-stream.c | 9 +++++++++ common/send-stream.h | 2 ++ 4 files changed, 45 insertions(+) diff --git a/cmds/receive-dump.c b/cmds/receive-dump.c index 20ec2b70..acc0ba32 100644 --- a/cmds/receive-dump.c +++ b/cmds/receive-dump.c @@ -329,6 +329,14 @@ static int print_encoded_write(const char *path, const void *data, u64 offset, unencoded_offset, compression, encryption); } +static int print_fallocate(const char *path, int mode, u64 offset, u64 len, + void *user) +{ + return PRINT_DUMP(user, path, "fallocate", + "mode=%d offset=%llu len=%llu", + mode, offset, len); +} + struct btrfs_send_ops btrfs_print_send_ops = { .subvol = print_subvol, .snapshot = print_snapshot, @@ -352,4 +360,5 @@ struct btrfs_send_ops btrfs_print_send_ops = { .utimes = print_utimes, .update_extent = print_update_extent, .encoded_write = print_encoded_write, + .fallocate = print_fallocate, }; diff --git a/cmds/receive.c b/cmds/receive.c index 27e5c003..897da372 100644 --- a/cmds/receive.c +++ b/cmds/receive.c @@ -1353,6 +1353,30 @@ static int process_encoded_write(const char *path, const void *data, u64 offset, compression); } +static int process_fallocate(const char *path, int mode, u64 offset, u64 len, + void *user) +{ + int ret; + struct btrfs_receive *rctx = user; + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, rctx->full_subvol_path, path); + if (ret < 0) { + error("fallocate: path invalid: %s", path); + return ret; + } + ret = open_inode_for_write(rctx, full_path, false); + if (ret < 0) + return ret; + ret = fallocate(rctx->write_fd, mode, offset, len); + if (ret < 0) { + ret = -errno; + error("fallocate: fallocate on %s failed: %m", path); + return ret; + } + return 0; +} + static struct btrfs_send_ops send_ops = { .subvol = process_subvol, .snapshot = process_snapshot, @@ -1376,6 +1400,7 @@ static struct btrfs_send_ops send_ops = { .utimes = process_utimes, .update_extent = process_update_extent, .encoded_write = process_encoded_write, + .fallocate = process_fallocate, }; static int do_receive(struct btrfs_receive *rctx, const char *tomnt, diff --git a/common/send-stream.c b/common/send-stream.c index 044e101b..bc41396e 100644 --- a/common/send-stream.c +++ b/common/send-stream.c @@ -369,6 +369,7 @@ static int read_and_process_cmd(struct btrfs_send_stream *sctx) u64 unencoded_offset; int len; int xattr_len; + int fallocate_mode; ret = read_cmd(sctx); if (ret) @@ -514,6 +515,14 @@ static int read_and_process_cmd(struct btrfs_send_stream *sctx) case BTRFS_SEND_C_END: ret = 1; break; + case BTRFS_SEND_C_FALLOCATE: + TLV_GET_STRING(sctx, BTRFS_SEND_A_PATH, &path); + TLV_GET_U32(sctx, BTRFS_SEND_A_FALLOCATE_MODE, &fallocate_mode); + TLV_GET_U64(sctx, BTRFS_SEND_A_FILE_OFFSET, &offset); + TLV_GET_U64(sctx, BTRFS_SEND_A_SIZE, &tmp); + ret = sctx->ops->fallocate(path, fallocate_mode, offset, tmp, + sctx->user); + break; } tlv_get_failed: diff --git a/common/send-stream.h b/common/send-stream.h index 607bc007..a58739bb 100644 --- a/common/send-stream.h +++ b/common/send-stream.h @@ -70,6 +70,8 @@ struct btrfs_send_ops { u64 len, u64 unencoded_file_len, u64 unencoded_len, u64 unencoded_offset, u32 compression, u32 encryption, void *user); + int (*fallocate)(const char *path, int mode, u64 offset, u64 len, + void *user); }; int btrfs_read_and_process_send_stream(int fd,