Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2338288imm; Mon, 28 May 2018 06:19:30 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqR90EdaLVJZzS6Qnn4eolpOODSItKLNd7ribnd5i72YWFHnmLRNnYHTj0UDFyANSzpGDmJ X-Received: by 2002:a63:bd49:: with SMTP id d9-v6mr10800697pgp.14.1527513570349; Mon, 28 May 2018 06:19:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527513570; cv=none; d=google.com; s=arc-20160816; b=iiMOJmC60shzCbYoxhk01HZW6lzJy2GxpsllwVFBGgRdMQDbC20ZgyH5AQXegzUK52 p+hgZ/KcuN/nErG/Wfd5jaO21u43p9FH/o72Q4FscBSMo9oKNeCeuaKlIb/zrdVjOEqG iNKuUGf29RZWpxRPNQkZkm71w7Mu471sR75sT4uYO1OAOKzFrN+UUI8ZWFT5E2DZar+0 bDScccv3rH0py9gdnR6XEXA8LDFUmvEYtpf1K6eiB9isxLyfJsPTpaIJRTkSxqiO0GfM q+YjpMP1iaFVC40OYpyPpsa+9z1RA2rRu/wo+o+OBSpjmP8MV2EoRbkXwai+XatXDeYC rGkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=myqo48vT9vccpKNzEUa4a/ICVLi9sOejRCjPZ3D9q9A=; b=q9Jm/dachCI4zvL4HQdsHtK8jFo9fLpHujFeH8qn7RUwgEimaxiFQmQvP0uqrYmiXP BUFqihTi+EB583FrafMmPjik+3oZZSIaXIVHEUNP2LVcfpDATaeK6pb1UTOVDpnvnDeV JXhK37FERJTRB3IxVP41akz1vA21VzcHODEGEyxyIn8lg1qcFOS71mvR0y/ZnDOjx9bl leVfkOCOSmN1/MoV1RuXbWjIdDyTORECoTkrmNZseZwy/tST9Fa08tdBWNC7382nYqmF DW7PB2TnwpX8xVBWmIVnHisOAfwczuxaFQP634e3aWLUOSgMmBVUbxiFEdfMRI2CE1+7 p45g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eM2s6h/7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h8-v6si12288106pll.58.2018.05.28.06.19.15; Mon, 28 May 2018 06:19:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eM2s6h/7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163580AbeE1Ktv (ORCPT + 99 others); Mon, 28 May 2018 06:49:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:39390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163570AbeE1Ktq (ORCPT ); Mon, 28 May 2018 06:49:46 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5B535204EE; Mon, 28 May 2018 10:49:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527504584; bh=PgQKKDg4f3IC9XJoPHg6VhecM3HCQ1c2yj9veCJQ6Sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eM2s6h/7uqNm3m9u52XmtcewHRQndy7iDwvMQ7ERXPFQgW2C50SlXHE8MOQl86sZh iqqhsaMqp/rD0Ewqt+lvbhRbeQ2Te9ePGEPknyLKlL/DvXADAGgW6LDJUAcvmj0g5m +ipJJxqHRGipkL+xFUZNnV4nh6gZjLO4JPKohbSM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 4.14 192/496] Btrfs: send, fix issuing write op when processing hole in no data mode Date: Mon, 28 May 2018 11:59:37 +0200 Message-Id: <20180528100328.031076035@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Filipe Manana [ Upstream commit d4dfc0f4d39475ccbbac947880b5464a74c30b99 ] When doing an incremental send of a filesystem with the no-holes feature enabled, we end up issuing a write operation when using the no data mode send flag, instead of issuing an update extent operation. Fix this by issuing the update extent operation instead. Trivial reproducer: $ mkfs.btrfs -f -O no-holes /dev/sdc $ mkfs.btrfs -f /dev/sdd $ mount /dev/sdc /mnt/sdc $ mount /dev/sdd /mnt/sdd $ xfs_io -f -c "pwrite -S 0xab 0 32K" /mnt/sdc/foobar $ btrfs subvolume snapshot -r /mnt/sdc /mnt/sdc/snap1 $ xfs_io -c "fpunch 8K 8K" /mnt/sdc/foobar $ btrfs subvolume snapshot -r /mnt/sdc /mnt/sdc/snap2 $ btrfs send /mnt/sdc/snap1 | btrfs receive /mnt/sdd $ btrfs send --no-data -p /mnt/sdc/snap1 /mnt/sdc/snap2 \ | btrfs receive -vv /mnt/sdd Before this change the output of the second receive command is: receiving snapshot snap2 uuid=f6922049-8c22-e544-9ff9-fc6755918447... utimes write foobar, offset 8192, len 8192 utimes foobar BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=f6922049-8c22-e544-9ff9-... After this change it is: receiving snapshot snap2 uuid=564d36a3-ebc8-7343-aec9-bf6fda278e64... utimes update_extent foobar: offset=8192, len=8192 utimes foobar BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=564d36a3-ebc8-7343-aec9-bf6fda278e64... Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/send.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -5008,6 +5008,9 @@ static int send_hole(struct send_ctx *sc u64 len; int ret = 0; + if (sctx->flags & BTRFS_SEND_FLAG_NO_FILE_DATA) + return send_update_extent(sctx, offset, end - offset); + p = fs_path_alloc(); if (!p) return -ENOMEM;