Message ID | 20200204013345.IPi4a1jYT%akpm@linux-foundation.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=xrrM=3Y=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B9BB013A4 for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 4 Feb 2020 01:33:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7C3D52086A for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 4 Feb 2020 01:33:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="s4I/kyr0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C3D52086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BF47A6B0008; Mon, 3 Feb 2020 20:33:47 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B7E426B000A; Mon, 3 Feb 2020 20:33:47 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A45AD6B000C; Mon, 3 Feb 2020 20:33:47 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0008.hostedemail.com [216.40.44.8]) by kanga.kvack.org (Postfix) with ESMTP id 8A8DC6B0008 for <linux-mm@kvack.org>; Mon, 3 Feb 2020 20:33:47 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2764F180AD802 for <linux-mm@kvack.org>; Tue, 4 Feb 2020 01:33:47 +0000 (UTC) X-FDA: 76450722894.21.look44_3e523ecfa502 X-Spam-Summary: 2,0,0,5902996fbbd9fd2d,d41d8cd98f00b204,akpm@linux-foundation.org,:akpm@linux-foundation.org:gechangwei@live.cn:ghe@suse.com:jlbec@evilplan.org:joseph.qi@linux.alibaba.com:junxiao.bi@oracle.com::mark@fasheh.com:mm-commits@vger.kernel.org:piaojun@huawei.com:stable@vger.kernel.org:torvalds@linux-foundation.org,RULES_HIT:2:41:355:379:800:960:967:973:988:989:1260:1263:1345:1359:1381:1431:1437:1535:1605:1606:1730:1747:1777:1792:2198:2199:2393:2525:2553:2559:2563:2682:2685:2859:2897:2901:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3150:3865:3866:3868:3870:3871:3873:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:4250:4321:4605:5007:6119:6238:6261:6653:6737:7208:7576:7903:7904:8599:8660:9025:9121:9163:9165:9545:10004:10913:11026:11233:11473:11658:11914:12043:12048:12296:12297:12438:12517:12519:12555:12679:12740:12783:12895:12986:13148:13161:13229:13230:13846:13870:14096:21063:21080:21324:21433:21451:21611:21622:21795:21939:21990: 30003:30 X-HE-Tag: look44_3e523ecfa502 X-Filterd-Recvd-Size: 6718 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf38.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Tue, 4 Feb 2020 01:33:46 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 A094E2084E; Tue, 4 Feb 2020 01:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580780026; bh=eUGLHKsD0gDB/DOwlgEWPdcCzsO7RgAosxbUhlZY91M=; h=Date:From:To:Subject:In-Reply-To:From; b=s4I/kyr0W7DPFj776QJRrO+Yi3Mresz66UHwl8iYkMOjML7TmOvxXs89Ody4D3+sv g3kQLSEaO++OMV9Zrel/oCCjl4Z4QL55GboNYOa5s1wNA8PoOJEN4kw9ZlgpD3UiLF jgGP0FX0cagPPuRPrzGSLzBPBP3HHarC9hR90jS8= Date: Mon, 03 Feb 2020 17:33:45 -0800 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, gechangwei@live.cn, ghe@suse.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com, junxiao.bi@oracle.com, linux-mm@kvack.org, mark@fasheh.com, mm-commits@vger.kernel.org, piaojun@huawei.com, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 01/67] ocfs2: fix oops when writing cloned file Message-ID: <20200204013345.IPi4a1jYT%akpm@linux-foundation.org> In-Reply-To: <20200203173311.6269a8be06a05e5a4aa08a93@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
[01/67] ocfs2: fix oops when writing cloned file
|
expand
|
--- a/fs/ocfs2/file.c~ocfs2-fix-the-oops-problem-when-write-cloned-file +++ a/fs/ocfs2/file.c @@ -2101,17 +2101,15 @@ static int ocfs2_is_io_unaligned(struct static int ocfs2_inode_lock_for_extent_tree(struct inode *inode, struct buffer_head **di_bh, int meta_level, - int overwrite_io, int write_sem, int wait) { int ret = 0; if (wait) - ret = ocfs2_inode_lock(inode, NULL, meta_level); + ret = ocfs2_inode_lock(inode, di_bh, meta_level); else - ret = ocfs2_try_inode_lock(inode, - overwrite_io ? NULL : di_bh, meta_level); + ret = ocfs2_try_inode_lock(inode, di_bh, meta_level); if (ret < 0) goto out; @@ -2136,6 +2134,7 @@ static int ocfs2_inode_lock_for_extent_t out_unlock: brelse(*di_bh); + *di_bh = NULL; ocfs2_inode_unlock(inode, meta_level); out: return ret; @@ -2177,7 +2176,6 @@ static int ocfs2_prepare_inode_for_write ret = ocfs2_inode_lock_for_extent_tree(inode, &di_bh, meta_level, - overwrite_io, write_sem, wait); if (ret < 0) { @@ -2233,13 +2231,13 @@ static int ocfs2_prepare_inode_for_write &di_bh, meta_level, write_sem); + meta_level = 1; + write_sem = 1; ret = ocfs2_inode_lock_for_extent_tree(inode, &di_bh, meta_level, - overwrite_io, - 1, + write_sem, wait); - write_sem = 1; if (ret < 0) { if (ret != -EAGAIN) mlog_errno(ret);