Message ID | 20210222121025.628566179@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <stable-owner@kernel.org> 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 EB634C433DB for <stable@archiver.kernel.org>; Mon, 22 Feb 2021 12:18:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A673964E61 for <stable@archiver.kernel.org>; Mon, 22 Feb 2021 12:18:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230099AbhBVMRb (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 22 Feb 2021 07:17:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:45452 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230399AbhBVMPq (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 22 Feb 2021 07:15:46 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9D7A664F12; Mon, 22 Feb 2021 12:14:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1613996073; bh=YQRGc5ZUeibdSR2xq8N0L7mh/79nWG0Mxa3J9FETjYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cLhzo4EaB8Aw3Ox+Wrh87dXCveQlwGRAcaOl93Tqs22ZYly93KqZJhg2jSG0biAz4 rYUpzzLe1+ILyQL8WgsE2+8/vXRbuP41hjHMnvq4LAh66N15NpRtq4E/T3AjJ1Uzsb XB3ZDd9ajU8jQKo/dDj3wv+LFBzAj55XaD/76MBM= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "stable@vger.kernel.org, dsterba@suse.cz, Filipe Manana" <fdmanana@suse.com>, David Sterba <dsterba@suse.com>, Filipe Manana <fdmanana@suse.com> Subject: [PATCH 5.10 28/29] btrfs: fix crash after non-aligned direct IO write with O_DSYNC Date: Mon, 22 Feb 2021 13:13:22 +0100 Message-Id: <20210222121025.628566179@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210222121019.444399883@linuxfoundation.org> References: <20210222121019.444399883@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8026,8 +8026,12 @@ ssize_t btrfs_direct_IO(struct kiocb *io bool relock = false; ssize_t ret; - if (check_direct_IO(fs_info, iter, offset)) + if (check_direct_IO(fs_info, iter, offset)) { + ASSERT(current->journal_info == NULL || + current->journal_info == BTRFS_DIO_SYNC_STUB); + current->journal_info = NULL; return 0; + } count = iov_iter_count(iter); if (iov_iter_rw(iter) == WRITE) {