From nobody Sun Feb 8 10:43:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E309EB64DA for ; Mon, 19 Jun 2023 21:21:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229808AbjFSVVo (ORCPT ); Mon, 19 Jun 2023 17:21:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229694AbjFSVVm (ORCPT ); Mon, 19 Jun 2023 17:21:42 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D334D10E; Mon, 19 Jun 2023 14:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687209521; cv=none; d=strato.com; s=strato-dkim-0002; b=LFVXYnZJP3AC4ueU5OSFywkBghrWBMJoaPp1Nr786WBT4H25sdRZekQJto2nthGHHl 1omr2W+S6zVlnSVtcyAW/YdVI9zlNiyjATrEYkcU71j6CtA346ESRbk3UwBGZjHTUo/a JiCy1BwEWoief1uGdfq0aJGOJR/1llf87lIJtGUFoNVkEj/0qxY8x4yYZ/ZwKxa2z/89 vJyUkfkTLHe+Yw+4c6ka4IzxyuTPz68FbAytIlF9/75kd23AQIpmnMIZkt2pQ4Pl1ZUV mUWumFY6Fp4wNkrzM/Sdfod2a1ui+wZkE7jsZVtrhZkUvIQkQyCd4q4Cx+qPd0jZJNK+ eMLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209521; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=NGBMcxhHLHH11bvOk7/wD+Xn9RcgMORp7BCVCyG5YE0=; b=AmoXSgTVG1F6LCKvW6LHTtlBOukQR3A7nuDxN8+LBG7M15CyW1KdJuR42QHlzHEqJx hXvHMHoYFOEsxZ/bZJwDcnxhl06tuw8EXsmoShxmel3WkGFQjzbeMpdGeeeVHTdM2RZ1 rrLB1+BQ8gVcW4CUd8f9ctiUTuDCfQsRgWabhYkfge5JLkttFrQXxtEd+tXWVtGbSzo5 qDd5sZAD1xBsZEdIFb4x5VyJEs8msvDVbzNTkDWFQomAx19x4CcI2x/rA8ZDTh8ZS6YL RuxWZeeT/2J8qRAa/JvuPLO7ls1FKeb39iIi0p4SARtsnVoIcGUpgFjhiFF+z6pBENyB eL0w== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209521; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=NGBMcxhHLHH11bvOk7/wD+Xn9RcgMORp7BCVCyG5YE0=; b=fjfTtql55O5eGJWVBFn9vZgvbB6aFpEsu1u1CJBfw2sCVF2CQyHS3QTOcEIoaUef/m DMmTxrRdiKmdgn6f3t8nMGFmUoLZhaKk429s3JuidosIF4uHOc6bQCBd+BkuHbJQZBUJ 6oW7TZEbzK+myWi7R+bRHSYM5fUxTQsFFc9Hz0ozKdCv7zAtUv4caiswcOCNFAYxUC5B BTBfEMTo3gx/EbJamvuYWrMR1gyXSO2UsS8Ack7H3oYCUi7ZA9bfC394OoesAXpaOUl5 KyRJozJ1VZLUcTjInUbe/Xk+g/o3J9w2RYq6B4tpd8PoiL23dVlHBwCaEX6Vq5X4b227 4tvA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1687209521; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=NGBMcxhHLHH11bvOk7/wD+Xn9RcgMORp7BCVCyG5YE0=; b=jHNcYo6tA2Qyd2g4wy+0S9wCS4sVfUGddQdOOD7Ivi00xskuQrYie0D6cGE0F9UYt0 edZbZL70/elm5QDN0fBg== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD1EQ33bneoxgmq7ABeEwyjghc0WGLJ+05px4XK4px0+bSzE8qij5Q=" Received: from blinux.speedport.ip by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id zb0c8bz5JLIfDvg (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 19 Jun 2023 23:18:41 +0200 (CEST) From: Bean Huo To: viro@zeniv.linux.org.uk, brauner@kernel.org, akpm@linux-foundation.org, jack@suse.cz, jack@suse.com, tytso@mit.edu, adilger.kernel@dilger.ca, mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, beanhuo@micron.com Subject: [PATCH v2 1/5] fs/buffer: clean up block_commit_write Date: Mon, 19 Jun 2023 23:18:23 +0200 Message-Id: <20230619211827.707054-2-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230619211827.707054-1-beanhuo@iokpp.de> References: <20230619211827.707054-1-beanhuo@iokpp.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bean Huo Originally inode is used to get blksize, after commit 45bce8f3e343 ("fs/buffer.c: make block-size be per-page and protected by the page lock"), __block_commit_write no longer uses this parameter inode, this patch is to remove inode and clean up block_commit_write. Signed-off-by: Bean Huo Reviewed-by: Jan Kara Reviewed-by: Christoph Hellwig --- fs/buffer.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index a7fc561758b1..b88bb7ec38be 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2116,8 +2116,7 @@ int __block_write_begin(struct page *page, loff_t pos= , unsigned len, } EXPORT_SYMBOL(__block_write_begin); =20 -static int __block_commit_write(struct inode *inode, struct page *page, - unsigned from, unsigned to) +int block_commit_write(struct page *page, unsigned int from, unsigned int = to) { unsigned block_start, block_end; int partial =3D 0; @@ -2154,6 +2153,7 @@ static int __block_commit_write(struct inode *inode, = struct page *page, SetPageUptodate(page); return 0; } +EXPORT_SYMBOL(block_commit_write); =20 /* * block_write_begin takes care of the basic task of block allocation and @@ -2188,7 +2188,6 @@ int block_write_end(struct file *file, struct address= _space *mapping, loff_t pos, unsigned len, unsigned copied, struct page *page, void *fsdata) { - struct inode *inode =3D mapping->host; unsigned start; =20 start =3D pos & (PAGE_SIZE - 1); @@ -2214,7 +2213,7 @@ int block_write_end(struct file *file, struct address= _space *mapping, flush_dcache_page(page); =20 /* This could be a short (even 0-length) commit */ - __block_commit_write(inode, page, start, start+copied); + block_commit_write(page, start, start+copied); =20 return copied; } @@ -2535,14 +2534,6 @@ int cont_write_begin(struct file *file, struct addre= ss_space *mapping, } EXPORT_SYMBOL(cont_write_begin); =20 -int block_commit_write(struct page *page, unsigned from, unsigned to) -{ - struct inode *inode =3D page->mapping->host; - __block_commit_write(inode,page,from,to); - return 0; -} -EXPORT_SYMBOL(block_commit_write); - /* * block_page_mkwrite() is not allowed to change the file size as it gets * called from a page fault handler when a page is first dirtied. Hence we= must --=20 2.34.1 From nobody Sun Feb 8 10:43:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82F73EB64DB for ; Mon, 19 Jun 2023 21:18:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjFSVS4 (ORCPT ); Mon, 19 Jun 2023 17:18:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229596AbjFSVSv (ORCPT ); Mon, 19 Jun 2023 17:18:51 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50275E4D; Mon, 19 Jun 2023 14:18:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687209523; cv=none; d=strato.com; s=strato-dkim-0002; b=iXW+saF7kB84ux5Sh1GzvZJAKM5oOuBilsfWS6nJnsZqanSKwfNjFgvG+3uYC0At5T 46+OSOvw14hhWN6sm7Q7fuSykcen5VPB9u+VR6Ks0MZDuDqDxJOH/1EQx+GI0Tt1V3wY V5b0WQQDknmTJSCBu1XqeLKozTUBqeIZO3aqTY8tZRz0en4UIAHlS0utuDXGJSqaRDrM yg3ZCSRoGdycEFF9T2xShKPKoHS8AswK+NKMBJiWfWoO99oGiS+4c9DJptA9zpLxX7Mf r8lguh0sBxgDMd83ERZopQUICpfj25TduZPOGqceozxeJfI1NEDsIX9MVJv7XaRmunfH t5ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209523; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=CKdAZMZFL1lysf+KGzAf1YfN52/k1jfBpqK7BEK4ECQ=; b=NdjepsXemP4zX5eP3+nASzm2MBNXIYeXB5ZOeZYL7NaB2qDBYchN58t2uXgJ7ajkPI kIeJVCh6dwRAtRDgPoCTb+wmqKQcQl1ETExCOA3GpIPBKAnvwGDeTRNsKf4rb1qurIHv mu9UlQhGvnN/octEhj8+IFkfNqEW0fYPt9qGbrMgbMlE+fP6RhTOFbMs1XXSiduTcI6w w0uWSS/XdOmXQaHWK4Imb0gLj77x7hLzS+QMkugDtzVYuMMWUvSXg64/GDBHPhZjAiN4 xhju/kIw3MUXy5Aw+lbD91HWLDrEm+1USzWhnNRf3sMBxi4YY0XPrmJqHzesDqWRiAsA Q0yw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209523; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=CKdAZMZFL1lysf+KGzAf1YfN52/k1jfBpqK7BEK4ECQ=; b=EvvbgWM/eCMk0n1VSSbXT5rhdyml+1hWKggc7OV/TwNzf/lpxIRIiAsZ/IxitXniZY L3eFUQ1m/YIeeOrkAqyaWo8LAbRKm+8bwV1Ui+7s3nf22PWg+Ep5dWyWWSITcXZeWJJ4 hNCb4IvvFumuArPd1HZDHAoXshSeoCVCIqwYdjknsaDDW2um3+K+lQVQfW9HgBGYulSV Yl4kFTUp3hEgo8eR0lJAKVP+IbW7eTh3i/7Cvp1kuwfhwAOxmWOSxrTMVyQ11S8+B3u9 h7jBvR1GbtaYn9hKMeq26e56ajUUGopdYp2L9jBuKWQBDohJ1OecAzcdk8JaMPp6ixEp aShw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1687209523; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=CKdAZMZFL1lysf+KGzAf1YfN52/k1jfBpqK7BEK4ECQ=; b=QqgNxw3eGfr+h4MqDUBKk1EMddioMAgXV+MI/gO1qh6s+TOSnMStcOSBEOs8ATjUi0 bWc3AC1Oo2rjqpMNwIDg== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD1EQ33bneoxgmq7ABeEwyjghc0WGLJ+05px4XK4px0+bSzE8qij5Q=" Received: from blinux.speedport.ip by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id zb0c8bz5JLIgDvh (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 19 Jun 2023 23:18:42 +0200 (CEST) From: Bean Huo To: viro@zeniv.linux.org.uk, brauner@kernel.org, akpm@linux-foundation.org, jack@suse.cz, jack@suse.com, tytso@mit.edu, adilger.kernel@dilger.ca, mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, beanhuo@micron.com Subject: [PATCH v2 2/5] ext4: No need to check return value of block_commit_write() Date: Mon, 19 Jun 2023 23:18:24 +0200 Message-Id: <20230619211827.707054-3-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230619211827.707054-1-beanhuo@iokpp.de> References: <20230619211827.707054-1-beanhuo@iokpp.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bean Huo Remove unnecessary check on the return value of block_commit_write(), because it always returns 0. Signed-off-by: Bean Huo Reviewed-by: Jan Kara Acked-by: Theodore Ts'o --- fs/ext4/move_extent.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index b5af2fc03b2f..f4b4861a74ee 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -392,14 +392,11 @@ move_extent_per_page(struct file *o_filp, struct inod= e *donor_inode, for (i =3D 0; i < block_len_in_page; i++) { *err =3D ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0); if (*err < 0) - break; + goto repair_branches; bh =3D bh->b_this_page; } - if (!*err) - *err =3D block_commit_write(&folio[0]->page, from, from + replaced_size); =20 - if (unlikely(*err < 0)) - goto repair_branches; + block_commit_write(&folio[0]->page, from, from + replaced_size); =20 /* Even in case of data=3Dwriteback it is reasonable to pin * inode to transaction, to prevent unexpected data loss */ --=20 2.34.1 From nobody Sun Feb 8 10:43:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4060EB64D9 for ; Mon, 19 Jun 2023 21:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229789AbjFSVT2 (ORCPT ); Mon, 19 Jun 2023 17:19:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229917AbjFSVTU (ORCPT ); Mon, 19 Jun 2023 17:19:20 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86E2CE64; Mon, 19 Jun 2023 14:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687209524; cv=none; d=strato.com; s=strato-dkim-0002; b=AaIvbocbXnLddTJMfkpJqlY+SicR25hAKIFhPjOIulppVG/MQ7mBiD+X9ZfeDzCT6G ZhmNMLMT9qWk5HQYS/tbm2VJnWArlDt5rybEIuiyaOV8QcSI3IS0yaY7gXmoj8TowWmm zoHLeIIr4JKp/O2mZILLcTlo4XBCvTt7tHIlX2k6Ygqm1xmoFV9tHoak5A6i1sdAkNYg emjOLMYe6V3cl15uLorq3YPtvqUUEWhR0AGo6cAZ2rsufFfqdLlBH4L2cPwfpXDKRSDy SGPqyqHI58TfX/YdfLaY/Ikv76gRJfujCD8UzuJKIIb6OglA9HvG7XdM4WO5xojWhGnB e2+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209524; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=e7SgMagTj0KzNfQID209UAiku5Vv3G7zNV+yggrUOg0=; b=Ew+b/YKs8kx7BkXCAj0i4MlXqoZ2AWq5VKfYj0Anc0b/qiUpfrwMux6D1Qyn40jisZ Rb4EmNjQiDzRlMPVzEgy3jC6MBfCiK70jA+b8dT/FKCMnl4zak4syhDOX4ih9k1z0LZN i+y6AjnMxEBac2WhLAAMrlxVOFqi/8wieGhhh3dPVj9OYxB+GN6dnRSfMo792BssGdYA o1rqqNeCVZ3UvFiMOKMwDuwGp82JmEWBrjPYroyfq9iRVVwLbpnSP3BflnhCXBXbA7cS ZzaQNRApre3d/pYSgSou04EXqBAN3MTx1TBOwgGSGrA0w5xZyDZqvHH1NGZGj7El04+k 13IA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209524; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=e7SgMagTj0KzNfQID209UAiku5Vv3G7zNV+yggrUOg0=; b=tnMfLNKBqdAppzTDzen+nISXF+7zLhHNYWQb7OCNkxdOzGrSO2c35RA972mfouTBzA bFgCMbKzliAdxQM1PscO6XLaGolVQm1yNZ3uUXSVzFr+rR7hXLbbEE+chqY3mOo9wTYr aLYBALR5LOF9cbisSX1wvpPXKrRdlMoNSMvqdpxgDNoUVj/68dpo8A3JAKA1XVxB6PrU Brw0yaPJWcO0lggtGTLy6SYdWZzobHjda1UYvbRqKUNJVGR7THmodrnrP++iW+1hpzvg VXW9QAiFA5tkz1Q+q0Zh+UDjpdqAePj6TJ/jKMLz6VA/A9qxlg2o638P/BfnfhSo0V4h DQbA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1687209524; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=e7SgMagTj0KzNfQID209UAiku5Vv3G7zNV+yggrUOg0=; b=yvRWX6/xx1vRUETU4+aQN4AZUBe951mXyeNy1E+9TrEe/RAbSDFqU8p1dKwDt8G2aX 7tZhIOxKcytpoqWrLYCQ== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD1EQ33bneoxgmq7ABeEwyjghc0WGLJ+05px4XK4px0+bSzE8qij5Q=" Received: from blinux.speedport.ip by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id zb0c8bz5JLIhDvi (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 19 Jun 2023 23:18:43 +0200 (CEST) From: Bean Huo To: viro@zeniv.linux.org.uk, brauner@kernel.org, akpm@linux-foundation.org, jack@suse.cz, jack@suse.com, tytso@mit.edu, adilger.kernel@dilger.ca, mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, beanhuo@micron.com Subject: [PATCH v2 3/5] fs/ocfs2: No need to check return value of block_commit_write() Date: Mon, 19 Jun 2023 23:18:25 +0200 Message-Id: <20230619211827.707054-4-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230619211827.707054-1-beanhuo@iokpp.de> References: <20230619211827.707054-1-beanhuo@iokpp.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bean Huo Remove unnecessary check on the return value of block_commit_write(), because it always returns 0. Signed-off-by: Bean Huo Reviewed-by: Jan Kara --- fs/ocfs2/file.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index efb09de4343d..39d8dbb26bb3 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -808,12 +808,7 @@ static int ocfs2_write_zero_page(struct inode *inode, = u64 abs_from, =20 =20 /* must not update i_size! */ - ret =3D block_commit_write(page, block_start + 1, - block_start + 1); - if (ret < 0) - mlog_errno(ret); - else - ret =3D 0; + block_commit_write(page, block_start + 1, block_start + 1); } =20 /* --=20 2.34.1 From nobody Sun Feb 8 10:43:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCFE0EB64D9 for ; Mon, 19 Jun 2023 21:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229800AbjFSVT6 (ORCPT ); Mon, 19 Jun 2023 17:19:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229865AbjFSVTe (ORCPT ); Mon, 19 Jun 2023 17:19:34 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74A9610DE; Mon, 19 Jun 2023 14:19:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687209525; cv=none; d=strato.com; s=strato-dkim-0002; b=bwDqLgqKnOIMa/KblGf7DCSOdomLj8qYLhRv9zU+ahqAVFoKEz5MFu0kXcY8KfhAXH tHC35vZ8b79c/wGpvuuwH2QAaTfqAoLCrBrZuHJJxWbHerBhq4PUi7Vxha3Lt8BBT++a OKVlUPZx2OqKhR369+AJkjCvIKU41m/VrYs2EeUKGffe4ZoycTYRomCfx4Cxb4nkBfob KFzO1JtbymOdSs9rmP9sHp/HzaLQpEkbXDikDDwi92tnabyBRhSnzBjy4mUV9h9H0BmU ZZEguartBN4n56Vgd2iftbjGb/E/g0Hu7r1bdkURzOMI+R21jP1xUByJNPN4IFLifAGU 6Z4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209525; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=u8a2OuOvxT1/oVmGmWM7pshVQC/wQv12L8jJddp76/w=; b=gZvQrwnarG0oeqM2lTZmo1obElmXryHEiGl5rTaOMytcF5GV6qb10JQRUSTlk78ZBr my2uhiRb7tODlRKlJfZGIMoWNHPtrxmySJWu32wwNlOkOy/CgjyhF3rfjwRPYzKdUJyA Y9Jp/f6lEFTd98Lm3aTZ3eAiF2SAjfE6536aVxKU4p82uao+Cjm5vpmj4aiCg5/w4OAz vXyLTe5Cqi4B70Mwo6078rUhPgHS/Nw9w8zI6M49hVkhWreHqAwDLzEl5Z+N3kyK3Ewk YnnuTk4NqUi55Ri4legQKGcYEdb3sVl6poNHO7b+6p22wVKdoRjfzekB9cuh1zcYyOaA /vBQ== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209525; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=u8a2OuOvxT1/oVmGmWM7pshVQC/wQv12L8jJddp76/w=; b=NWHvLYHVBE3vESRJ/FKFx1BobgaCF60h+WBAXiODGLsXtceWhYn7PgNv3MV5MXctni FK/8gdXtnsHydylzQbFCYdTwzC4MZmRWSP6OYqsFThJ0kysIE4SDRaLDFxoaXFZLA1xC XckGwVvQhj63Lc9eVAzGHMasn7FQiEPnYraBh8/Ygwm7C3hujqBNPYoJp/F04jznI2Qz OnQixCQPT3StmDtCX5MrkWLj67MM9yggscCU3RdXslVV0bNEHGn/bYstka/MGSE5IKVe QK2OuVNkugRG7bF3ujpI8fK653bXfGgH3fyF2pfZIilyQ7l6tkBDYI3BaO8mzAzaxnGp vZQQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1687209525; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=u8a2OuOvxT1/oVmGmWM7pshVQC/wQv12L8jJddp76/w=; b=4rKvSZyKZJICpIQNJpD8yX06uHxBEBD8VbMS0AWhaOLUZImM7784EgsI2s7KDFBrz/ ua48CzseU5n1lhgMvhAA== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD1EQ33bneoxgmq7ABeEwyjghc0WGLJ+05px4XK4px0+bSzE8qij5Q=" Received: from blinux.speedport.ip by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id zb0c8bz5JLIiDvj (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 19 Jun 2023 23:18:44 +0200 (CEST) From: Bean Huo To: viro@zeniv.linux.org.uk, brauner@kernel.org, akpm@linux-foundation.org, jack@suse.cz, jack@suse.com, tytso@mit.edu, adilger.kernel@dilger.ca, mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, beanhuo@micron.com Subject: [PATCH v2 4/5] udf: No need to check return value of block_commit_write() Date: Mon, 19 Jun 2023 23:18:26 +0200 Message-Id: <20230619211827.707054-5-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230619211827.707054-1-beanhuo@iokpp.de> References: <20230619211827.707054-1-beanhuo@iokpp.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bean Huo Remove unnecessary check on the return value of block_commit_write(), because it always returns 0. Signed-off-by: Bean Huo Reviewed-by: Jan Kara --- fs/udf/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/udf/file.c b/fs/udf/file.c index 8238f742377b..b1a062922a24 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -67,13 +67,13 @@ static vm_fault_t udf_page_mkwrite(struct vm_fault *vmf) else end =3D PAGE_SIZE; err =3D __block_write_begin(page, 0, end, udf_get_block); - if (!err) - err =3D block_commit_write(page, 0, end); - if (err < 0) { + if (err) { unlock_page(page); ret =3D block_page_mkwrite_return(err); goto out_unlock; } + + block_commit_write(page, 0, end); out_dirty: set_page_dirty(page); wait_for_stable_page(page); --=20 2.34.1 From nobody Sun Feb 8 10:43:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7CDCEB64DC for ; Mon, 19 Jun 2023 21:19:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229849AbjFSVTd (ORCPT ); Mon, 19 Jun 2023 17:19:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229922AbjFSVTV (ORCPT ); Mon, 19 Jun 2023 17:19:21 -0400 Received: from mo4-p03-ob.smtp.rzone.de (mo4-p03-ob.smtp.rzone.de [85.215.255.102]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 309E61701; Mon, 19 Jun 2023 14:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687209526; cv=none; d=strato.com; s=strato-dkim-0002; b=m14ydInAO32RSNeBAEUmo5VtS9IdNsIE1lEAXPUqN3jpWhmRIQgK47Y/rbAT3wMzzQ zFtEMz7KVxS3NSfPnKVhU8xUFPgcXLrgGIWN2Mu6997FuL8lqVsKbxqkA5fE3gv3MDvZ JWD0zt4m7taKUiiTj/MHW/kGwq6EOfjUlaUH7tbWkr4Af8BIy7xIimnnWnFOzHZDScLt 3eQQywEXNYQ+IC988XlH/CzjqwE7RWPjci5ZMT3eKpmQ4AYgRzTbVvGQ14Z3slHIt375 Yy3e8mWPjZSUhmyrItczO8JH8++rOTMjFybtj/1ToabmROD6JBE3b3hIRI6t4sFE0TtU aoQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209526; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=4VoCJCkUkGyuMs9ktPD9dGvwPKJ6aIyifN3L5LWABx8=; b=JvbswYT1Nxu/3JVFow4AGCMKUY/2XH05O3KHS/AN8d5uMp/6ohrS1PkKNW1d/qNfgx ehqaHoKJtUwJelBXbn8r72WycTsEtzleB3hRsAdSOiMxKKKUyyzM1b0QCThREEAj4AVl q5Zch4h3R7Uu5hmKzx0c67sYBQ7RCDzOg2GeGoQXN0rqERPliWUQ7yvIll/pNLS86+kk ycpoPF2xhfADP3mWfL3TWsU3V7nm1cIVk4/xiq4xy4rgcMqi+C1ZDffmzSuCPuUy2QbM /SnVisX5HcQFQW9BMmEdDPGdYuiBwFgNDv/UpoVl9iqq0weeChmJvaYg58IuIMlqC5Qo pzxA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo03 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1687209526; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=4VoCJCkUkGyuMs9ktPD9dGvwPKJ6aIyifN3L5LWABx8=; b=GQuLI20iuo/3e3+FcTWN+gW33eL6iyjV5edlrwBquBLU1yKxMk3gJO7CkF6DC8eUq6 gHTqB7hfa+ATxhvaPSMfQF2q1ieLcDoBiT59Fsr1IPCYkHAsKStHGpL5+2bmwDdUy5o6 wWcaHwSe4L7bsjHTc+Z2xsLCyrvZnNGEpGXihjQrDj+pGs7x89Ywj1dSAEhZdOzDw30X xBQqWzsXqNbS7+ugJ5EL0MiFGcZuz8DhcDB1mRCCRnQFkCb9JzLKyz9t7rn+bd+LO1cC bPTxr2ni/HsxkQCdCwk6SUJrBKWPg4dVvZ6emoZsJFm5HNNbg2fpUBWqLP/n/eSdf1Eq JkWg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1687209526; s=strato-dkim-0003; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=4VoCJCkUkGyuMs9ktPD9dGvwPKJ6aIyifN3L5LWABx8=; b=Fi7GsifBZj+G9wnlO1nTmf1xXDrGLocv0iS6G3hKSGfd89rdXROo90SMzMsF39I5um 2ld4NTWy8oTessFRFiCw== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD1EQ33bneoxgmq7ABeEwyjghc0WGLJ+05px4XK4px0+bSzE8qij5Q=" Received: from blinux.speedport.ip by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id zb0c8bz5JLIjDvk (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 19 Jun 2023 23:18:45 +0200 (CEST) From: Bean Huo To: viro@zeniv.linux.org.uk, brauner@kernel.org, akpm@linux-foundation.org, jack@suse.cz, jack@suse.com, tytso@mit.edu, adilger.kernel@dilger.ca, mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, beanhuo@micron.com Subject: [PATCH v2 5/5] fs/buffer.c: convert block_commit_write to return void Date: Mon, 19 Jun 2023 23:18:27 +0200 Message-Id: <20230619211827.707054-6-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230619211827.707054-1-beanhuo@iokpp.de> References: <20230619211827.707054-1-beanhuo@iokpp.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bean Huo block_commit_write() always returns 0, this patch changes it to return void. Signed-off-by: Bean Huo Reviewed-by: Jan Kara --- fs/buffer.c | 11 +++++------ include/linux/buffer_head.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index b88bb7ec38be..fa09cf94f771 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2116,7 +2116,7 @@ int __block_write_begin(struct page *page, loff_t pos= , unsigned len, } EXPORT_SYMBOL(__block_write_begin); =20 -int block_commit_write(struct page *page, unsigned int from, unsigned int = to) +void block_commit_write(struct page *page, unsigned int from, unsigned int= to) { unsigned block_start, block_end; int partial =3D 0; @@ -2151,7 +2151,6 @@ int block_commit_write(struct page *page, unsigned in= t from, unsigned int to) */ if (!partial) SetPageUptodate(page); - return 0; } EXPORT_SYMBOL(block_commit_write); =20 @@ -2577,11 +2576,11 @@ int block_page_mkwrite(struct vm_area_struct *vma, = struct vm_fault *vmf, end =3D PAGE_SIZE; =20 ret =3D __block_write_begin(page, 0, end, get_block); - if (!ret) - ret =3D block_commit_write(page, 0, end); - - if (unlikely(ret < 0)) + if (unlikely(ret)) goto out_unlock; + + block_commit_write(page, 0, end); + set_page_dirty(page); wait_for_stable_page(page); return 0; diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 1520793c72da..873653d2f1aa 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -284,7 +284,7 @@ int cont_write_begin(struct file *, struct address_spac= e *, loff_t, unsigned, struct page **, void **, get_block_t *, loff_t *); int generic_cont_expand_simple(struct inode *inode, loff_t size); -int block_commit_write(struct page *page, unsigned from, unsigned to); +void block_commit_write(struct page *page, unsigned int from, unsigned int= to); int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, get_block_t get_block); /* Convert errno to return value from ->page_mkwrite() call */ --=20 2.34.1