From patchwork Mon Oct 31 23:28:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2610260wru; Mon, 31 Oct 2022 16:31:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5C+tEWg7L3HsnTNqY9od3qo1HLILjBikQwbtfSDy5kiFpBpM5TyDKXvO/8xlK3cErWciH4 X-Received: by 2002:a05:6402:414f:b0:456:c2c1:23ec with SMTP id x15-20020a056402414f00b00456c2c123ecmr16586245eda.420.1667259096086; Mon, 31 Oct 2022 16:31:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667259096; cv=none; d=google.com; s=arc-20160816; b=g+ADotAZCwSGaiv5uh49zi+4DaBg4icnTH3hnUEOmuGbP2JfjzWyd4VaMJejPeiHLm WmgcQbNtwdlW1vWLolTPhRhX7Ur73XVr4+YQ0zIUxLZ+d4Vuv6pwEhCRlpnsbeI8cwTE SXvBk1EV3+ORTiReRxs12+1xnmRzGv5XX63GI/WACqhmaHxnbV2Ux9S/pWAffoPZ+l+U 3xjBZI3JDK864DBFrj0qM67TFip4pBDeAUuWQsD1tiVKjeDzAHe3xC+l916JuUX+Dn5S 6QePrK3V2G8k0Dl8rRfIot3Zxwu+9joodpEDhvwF5emr8icIFBQYM6Qn63cFA1j9e80T X8Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=EobGCR5OS2bog5PZfGzOEYsmFg5dsfh7cCbyk4MhpG8=; b=QnUdQiw0TmrBFYbnwKAd6fBrUf9j5gEK7t9vIr2nP/rvBDGf1n2rvgv5zF3tWCyPPF WnNpQDago+Sts0chyUplVn0cBsd/yB/LuRVW2T5NyH/AebKbu9VftKoeXYaAkjovhXvz uRiqWJeYsPIzOptfBpalEhqf+zkOlsZdTTl4jil+cCO+LInQGCkSC77bg+1/dOSwkuhR De9B08pxvdpiAYtl6HlZMbTSc6WgEIhBb/K16o9VYQ0u7n9tNpTZjbkUEpxl+ub8jmZX iBw0zb3e8POC8a/zOmCG8l+dpCzDjacuRsSQoBw1p/BA1gmcvile5StHMgod5JlaJkkk FBCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=TY6YGwrC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e18-20020a170906505200b007acef6b1f00si8558369ejk.419.2022.10.31.16.31.11; Mon, 31 Oct 2022 16:31:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=TY6YGwrC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229936AbiJaX3k (ORCPT + 99 others); Mon, 31 Oct 2022 19:29:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229707AbiJaX3X (ORCPT ); Mon, 31 Oct 2022 19:29:23 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1CF015FFC; Mon, 31 Oct 2022 16:28:53 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4N1Tqh6gmWz4xG6; Tue, 1 Nov 2022 10:28:48 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1667258929; bh=EobGCR5OS2bog5PZfGzOEYsmFg5dsfh7cCbyk4MhpG8=; h=Date:From:To:Cc:Subject:From; b=TY6YGwrCCzMunKpwsSnRYSg3y2HrCLb9BaLICyw15/W04SIBxaORLcFS9hXAmRuXT H/SQlGm9z7NHE/MzrEQilKHo9Gz0hLHUG/dBhQxnxh8Edbj6o0Wle6vdN96TGCgpvP tqRzsGxQqe7hGM7fMRv2euFBpmEZbnvDGybqsTQ6NXBxYUbHp3VuF7S91dooIPfUrD VX/CiQBlOvBLNNsRIAjvr4cg2NzrlNhtUYG1cE9DsS4A360DWsDF7sFgWOa9ahNCjf gZsrLJQhyVCgxtNtXkVa/E0ZLEij5qGwLYdQ2XcxZv1BiNpYIaN7lotMnhFoo2+6xw AtymNNjaqJnBg== Date: Tue, 1 Nov 2022 10:28:28 +1100 From: Stephen Rothwell To: David Sterba Cc: David Sterba , Filipe Manana , Josef Bacik , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the btrfs tree with the btrfs-fixes tree Message-ID: <20221101102828.7c6e1597@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748247874339005652?= X-GMAIL-MSGID: =?utf-8?q?1748247874339005652?= Hi all, Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/ctree.h between commit: 8184620ae212 ("btrfs: fix lost file sync on direct IO write with nowait and dsync iocb") from the btrfs-fixes tree and commit: d98f802c975e ("btrfs: move inode prototypes to btrfs_inode.h") from the btrfs tree. I fixed it up (I used the latter version of this file and applied the following merge fix patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Tue, 1 Nov 2022 10:24:24 +1100 Subject: [PATCH] fix up for "btrfs: fix lost file sync on direct IO write with nowait and dsync iocb" Signed-off-by: Stephen Rothwell --- fs/btrfs/btrfs_inode.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 79a9f06c2434..d21c30bf7053 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -526,7 +526,10 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from, const struct btrfs_ioctl_encoded_io_args *encoded); -ssize_t btrfs_dio_rw(struct kiocb *iocb, struct iov_iter *iter, size_t done_before); +ssize_t btrfs_dio_read(struct kiocb *iocb, struct iov_iter *iter, + size_t done_before); +struct iomap_dio *btrfs_dio_write(struct kiocb *iocb, struct iov_iter *iter, + size_t done_before); extern const struct dentry_operations btrfs_dentry_operations;