From patchwork Wed Sep 25 19:54:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 1989519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=web.de header.i=markus.elfring@web.de header.a=rsa-sha256 header.s=s29768273 header.b=WZlV1OKt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=150.107.74.76; helo=mail.ozlabs.org; envelope-from=srs0=cgi1=qx=vger.kernel.org=linux-ext4+bounces-4322-patchwork-incoming=ozlabs.org@ozlabs.org; receiver=patchwork.ozlabs.org) Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XDSC31T9Vz1xsn for ; Thu, 26 Sep 2024 05:55:43 +1000 (AEST) Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4XDSC16NFxz4xQ6 for ; Thu, 26 Sep 2024 05:55:41 +1000 (AEST) Received: by gandalf.ozlabs.org (Postfix) id 4XDSC169Czz4xQN; Thu, 26 Sep 2024 05:55:41 +1000 (AEST) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; arc=pass smtp.remote-ip="2604:1380:40f1:3f00::1" arc.chain=subspace.kernel.org ARC-Seal: i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1727294141; cv=pass; b=fbVNB8/fkL30xPytvOux0X2XlaQNg3JSczMFGhS9DaM8HQBdBMtOMukzLbrk33RnctEgyLJPqm0RH+7mGuICvkH3LCK7ZsdCAR+ci+ZNTnN7cyKFqvFRO7uH39Ief8SAZi72iOTbsO94Hyna5rSuy9Rqlm01Emu2SiqUjekJQrIThIS411+25EeC4+QtHmokZ/ndhSAjA07TTXpvakET4hARmCMVHhYMVp2E0d0Zocpxp8ngftSJZplqb6uNKYKk2cznFQkKsmWy51amoshHtIZsfB6NJs/UIq2SVKTrv+1ysjhoUTQDCukNfAnbtfQNFBCgGE2Ih615NDD9MjW15w== ARC-Message-Signature: i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1727294141; c=relaxed/relaxed; bh=oZFXgGZpN35Zb33XWrmn6Py5ABUqGOrhRxGCArCoPsQ=; h=Message-ID:Date:MIME-Version:To:Cc:From:Subject:Content-Type; b=FoF9rz/EXm2Nfvaq5dV3lmDCipe96oSfpKBYKzgJ8xalCGb4UX4CdSCARAPWiZOczbB83an88iR28mAKJOKK9Hu09Qa4335XwAmZkQD84PIfThcQIpTHrEM8SeLo1xplX4vkO2ScIi68/QP1cUCRn5zusN+VWkbAG9h+ZiaPSvXbIl4rs+mR285dJcNxhvP/orWadwkxNenMD4H6VRWX0tDTFOSygWQAFnKzbg+jEPcDFzNtFvHzEpmT++AyfaF5G3BCTzIa73UdC/meib81fjVQOi9tJ8W3c2jRHzme+jBbRC/uk5yMYfrmhy9v8/cSf/5+IPgW03oEofaibktSYg== ARC-Authentication-Results: i=2; gandalf.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=web.de; dkim=pass (2048-bit key; secure) header.d=web.de header.i=markus.elfring@web.de header.a=rsa-sha256 header.s=s29768273 header.b=WZlV1OKt; dkim-atps=neutral; spf=pass (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=linux-ext4+bounces-4322-patchwork-incoming=ozlabs.org@vger.kernel.org; receiver=ozlabs.org) smtp.mailfrom=vger.kernel.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=web.de Authentication-Results: gandalf.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=web.de header.i=markus.elfring@web.de header.a=rsa-sha256 header.s=s29768273 header.b=WZlV1OKt; dkim-atps=neutral Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=linux-ext4+bounces-4322-patchwork-incoming=ozlabs.org@vger.kernel.org; receiver=ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [IPv6:2604:1380:40f1:3f00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by gandalf.ozlabs.org (Postfix) with ESMTPS id 4XDSC03n2Mz4xQ6 for ; Thu, 26 Sep 2024 05:55:40 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 53831B23ABD for ; Wed, 25 Sep 2024 19:55:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D4B15146593; Wed, 25 Sep 2024 19:54:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=web.de header.i=markus.elfring@web.de header.b="WZlV1OKt" X-Original-To: linux-ext4@vger.kernel.org Received: from mout.web.de (mout.web.de [212.227.17.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C149C145B26; Wed, 25 Sep 2024 19:54:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727294077; cv=none; b=VkOPWqLbjYwyrqzCYlDbwPh9RAW9QHKTZAqKCRJnOEw0NuX16Brr15jFpT3CrU2GvEEBSyOKTeAmlhlkQ2WU85+uctNyTJs6oMVLPUWTykktf+mJbv70vDn1xZ5vug9GwEDg0uUXQ2AjMn5FhoJUXhPyXbx19qxE6885tNxqYhA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727294077; c=relaxed/simple; bh=MHYemQ4iLJxEt+SBHZ8DDhtdDBmysgd2m8HWLVTbcLk=; h=Message-ID:Date:MIME-Version:To:Cc:From:Subject:Content-Type; b=nrRnRTBxZ83ZmJGp/mPeZ72lYSoKmqtlexdVw2cB2+htMWNDcJ31OJC3BFQJ3gywcH2k1LMgCyQfo1Toy0+KxWcZU8IhMqENgK5RLVoY+81qzRwd6YEjVW1EvS7Vc6hTayD2R9tQZooOZN7ZJ5EFn97nULLcV0Y/x13UIxm1xdo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=web.de; spf=pass smtp.mailfrom=web.de; dkim=pass (2048-bit key) header.d=web.de header.i=markus.elfring@web.de header.b=WZlV1OKt; arc=none smtp.client-ip=212.227.17.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=web.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1727294064; x=1727898864; i=markus.elfring@web.de; bh=oZFXgGZpN35Zb33XWrmn6Py5ABUqGOrhRxGCArCoPsQ=; h=X-UI-Sender-Class:Message-ID:Date:MIME-Version:To:Cc:From: Subject:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=WZlV1OKt8vJe+eWHvXmXian3WVMAsLdis6oc6rAYeAgIWdG1xCuyf/SAQXqtr+s/ F4iFc60CGfBiPHosuHxSLBDaLHDOGOGEprWdxfMmboMVoM5FPs0u8Hp5qeTghNMPY R+Nf2MkmArRMvOpV3DJ50ipKgzQmaNhdNcr4cbeNO4rUyAE77MhWz8wxaYaDR/ceu 8/cEWChONkGNknDF6nHfzoYkTkxHehp2HG6nt1nZIsaBYjQlUA9ClogqPKQkBRQyM bLuYFYGZTThnJRGB2HMq4B5fmq/HmzJtZQkB80xGY+ikmLnRHnWPjJBs25c5NrpsV Rf9xT56OR6RACRguCg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.84.95]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MRW6Z-1sWg9a3le1-00P9Iy; Wed, 25 Sep 2024 21:54:23 +0200 Message-ID: Date: Wed, 25 Sep 2024 21:54:18 +0200 Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: linux-ext4@vger.kernel.org, Andreas Dilger , Jan Kara , Matthew Bobrowski , Ritesh Harjani , Theodore Ts'o Content-Language: en-GB Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Subject: [PATCH] ext4: Call ext4_journal_stop(handle) only once in ext4_dio_write_iter() X-Provags-ID: V03:K1:N+Rv56bpzb01vFl7kAaSa0ilOzgrnXCwdreS4Meu1k9Ls8DgELx MRrsN3KmVbKDIU1FGMitIJoC6nM7t5Cdr3Xe3JT7EVTSwhqeTY/eIrQeRHM7IAHgfd0cQYG raRYCIU8166o9UUv/CgiRSEd4ie0/wvJPMudeQFymHzQDQdxmxARo66K05VK4vPhKCXPJYH kAQNXGMA/1iQSWYJFNCfA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:kajW8eoXXRI=;WidS8QTOOMrNRr758M3ooy1P6F4 G2wZH3SQPlqT4Zh9CLES7uKaC9L2A+lOQA5qk8+ZVvIUUyowkYISsZE9ElJaJRt5pXJM3zB2m ETcP2gOzySNsH0D4ej490l04gwHtLQDuz8RL8gQ6LVHqshEzVLvlQGdRoRO1q2QpQyA42CLr6 Jx0dwCDU7Hv8TvC8qZKTF9yXSx/ZJSLJTowF0aGsFQlrlAZ1sF/5hrtqyo9bkTXvWXmDJ/z9j vm7eNtgrgfVI5wD02XN/FGiiAwszZIr4wGSpA26iY/5fA59qalsTZAZDQruC0ucdfdzc/ws1a AH8hgETGYm4XYN4dmng3q3eZyOmdf1FMsn39LGO6nCafv2fWviUUkP5MVvGtZz8ux8zITjid9 AOO9yijvkwk+bEbqt5Bj8+0gkOdhqhejfvjITsVy7HOBGqtiC/6xPpRJR+pORFzrMudI4Of/7 Arn74bZOLYvprIgq156zOz/jjh7zBLkAaJT+tvfBrj9focTJvakUbUx/3GS36F3wRsvtPW+oD pui4BX7rfw/rPjxLOuOsAJ3cI9Goik8DcyRlocERetQvGwI8PzTXIo0+kg+i7YVp1AOEVZg8y 5cWxVhOO8TASr97fF/FfAAKYP1SLC47sMkeh3GFRhmSrlBNLgSHw+EW8gRQcprqpBrQENHlRO jqrmFd83wv2pdU3P3wEiqcf1T/1Y2wWLpgSKWUGcE4C1keyo8twcAjppq6QevHMn5XlL6hnin XHEkMeAQZg/c7h4hOePQ+Ymsvc7BFmBrisBIXQrQ/GvsAcS1C5Q898EFpiEleHL8AtbVqc60r epB0pNSSbwdPI/a7sCbY1guA== From: Markus Elfring Date: Wed, 25 Sep 2024 21:47:39 +0200 An ext4_journal_stop(handle) call was immediately used after a return value check for a ext4_orphan_add() call in this function implementation. Thus call such a function only once instead directly before the check. This issue was transformed by using the Coccinelle software. Signed-off-by: Markus Elfring Reviewed-by: Zhang Yi Reviewed-by: Jan Kara --- fs/ext4/file.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.46.1 diff --git a/fs/ext4/file.c b/fs/ext4/file.c index f14aed14b9cf..23005f1345a8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -564,12 +564,9 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) } ret = ext4_orphan_add(handle, inode); - if (ret) { - ext4_journal_stop(handle); - goto out; - } - ext4_journal_stop(handle); + if (ret) + goto out; } if (ilock_shared && !unwritten)