From patchwork Mon Jun 19 21:18:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 110169 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3258163vqr; Mon, 19 Jun 2023 14:26:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6/C8z7+uU9Vwugm+ZRFhLXBxxT/rgDskOYgd8s4Jbidoya94192LBul+l8ra40mWKXHyM7 X-Received: by 2002:a17:90a:e2c8:b0:25e:b450:c5f1 with SMTP id fr8-20020a17090ae2c800b0025eb450c5f1mr13796770pjb.4.1687209993694; Mon, 19 Jun 2023 14:26:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687209993; cv=pass; d=google.com; s=arc-20160816; b=bHDcpYO6v4LHvMd5iK3bc2keerbiERkPcuDI1VvKNEUqVrik+E+7+8KsZeTlgNV8Bk GW2IENTSdOi3OYm/22wIib/cGmS8CkHNzp1sdUom7VEkFC9usDVTcawqclbZpIMqBey1 ltw5x3NeXEMWEfSgfbr3t7vb2nXoejrUv2d35YFds5tqcO+LSXfIg+Pr86OoL0Pr31Pv SnJS76klwJqWCX6XlPM7GHXRBedJqMiBF4/NUzxNWYxh6NW09ZvfQlSmBWTYwAlWyn8P nVol12KdGVws/GCNw56/o8Ha4WDrhsyGWRtJ8iQmosVQ9uum79FR/zaw8iBakGBT2NvL D57w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=NGBMcxhHLHH11bvOk7/wD+Xn9RcgMORp7BCVCyG5YE0=; b=S1iqK56GjAtM3bi8UjjzFck6kZthEpRB9+30KXKjNc08z3OVXfJo2rR06vpC9ByGwQ 33N+V8ezZ6onp3IkoeCgCAq0gOXXXvWznvxUEDk1RYadBjGjpYq/3FuUhjdOpjSQg8YR eCpRaalnS0pj5+8YqGLXJMTT25+aqleH4ztfTiudV5FDx5e2wH79hniZW0HGHkvPedeX LmoIK8BDDBd8DSPLFGKcaWhoCUSDxMPEnmkke9BZWZe17FNVMsrrlOXtkt5Eig2SlGQC D5npWgIQTXt9W746iAmv49J2vstFEpm+/Sh3hrge8SU1hV8AR0+h4C3F+6tszewyqX8T MHXw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=fjfTtql5; dkim=neutral (no key) header.i=@iokpp.de header.s=strato-dkim-0003; arc=pass (i=1); 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 hk12-20020a17090b224c00b0025ee198e6f7si5728064pjb.168.2023.06.19.14.26.19; Mon, 19 Jun 2023 14:26:33 -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=@iokpp.de header.s=strato-dkim-0002 header.b=fjfTtql5; dkim=neutral (no key) header.i=@iokpp.de header.s=strato-dkim-0003; arc=pass (i=1); 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 S229717AbjFSVVo (ORCPT + 99 others); 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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?1769167906244878396?= X-GMAIL-MSGID: =?utf-8?q?1769167906244878396?= 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); -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 = 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); /* * 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 = mapping->host; unsigned start; start = pos & (PAGE_SIZE - 1); @@ -2214,7 +2213,7 @@ int block_write_end(struct file *file, struct address_space *mapping, flush_dcache_page(page); /* This could be a short (even 0-length) commit */ - __block_commit_write(inode, page, start, start+copied); + block_commit_write(page, start, start+copied); return copied; } @@ -2535,14 +2534,6 @@ int cont_write_begin(struct file *file, struct address_space *mapping, } EXPORT_SYMBOL(cont_write_begin); -int block_commit_write(struct page *page, unsigned from, unsigned to) -{ - struct inode *inode = 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 From patchwork Mon Jun 19 21:18:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 110168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3257935vqr; Mon, 19 Jun 2023 14:25:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5FAWbhXghnHi5agSHaFOl/qekQknAx566OIxnccVHBZiD7UApzOnt+79bacbKOBqJ3O01S X-Received: by 2002:a05:6a20:9144:b0:119:be71:1596 with SMTP id x4-20020a056a20914400b00119be711596mr15326312pzc.13.1687209958622; Mon, 19 Jun 2023 14:25:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687209958; cv=pass; d=google.com; s=arc-20160816; b=VftDt8wYJwe5ZjMl8u11plU2hgV8jvuX8oexxT3O8A5+Gz984byrbH96cFIwaLIwUa esMo71adV47CpEJH8bc7+iXxrVeoJ9+TsVn7Wc1XQD0/gqdKN9vJs4y4yau8rIuGEF/P 5E0kRN947ffXgZza6dxWeBkIJ7n5GSBxJ62kFxPpurnnmOedzoXVxOjULMBh/P7eWIjd 7bncW1ElB73Qwz0ZSN5dmT2JJEf/jFoqKGqG6zceh+PSmguUnn9V2ScjYBzGlMFt+zRj GC9ZQ3VaNlbz1Hmo2pBKLPkUsrpMSTCKB100mIufKM9OHqCfV6IWgmfxoY8yGYL5rt/C qfug== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=CKdAZMZFL1lysf+KGzAf1YfN52/k1jfBpqK7BEK4ECQ=; b=vmB+v3DcazPiMk8I4VtoEUOJJ09WFtbb4QDxidDzLjYx4WUdEE+A/JywLwcCq4PX/0 3/54vetgrhr2VUKAIyJHOLX5K5/Bv8ZGncohL+n3Eqyh/1aqy4BOxYntYxnh18CR8qjY Zf6uEReujWcvUFdVm3/NyPQIBMhHTOf7pXykgMkCkQJV2UACrSQB7/pVC4H8DUZBhL3y rVOLlqXVcdHsf+dXrt2cDvj4z9jb7NOReklFIKUnT5FNcv9Nuxtdl86D3uTi7+JxKciT yOkSh19iloUa484siXIu54yAoOLpcu+UbwzMGQR3DSgSwzQ17qjHyQ26nhOvz0aEGN6T C2MA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b="EvvbgWM/"; dkim=neutral (no key) header.i=@iokpp.de; arc=pass (i=1); 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 y193-20020a638aca000000b0051394ccd19csi308282pgd.55.2023.06.19.14.25.44; Mon, 19 Jun 2023 14:25:58 -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=@iokpp.de header.s=strato-dkim-0002 header.b="EvvbgWM/"; dkim=neutral (no key) header.i=@iokpp.de; arc=pass (i=1); 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 S229738AbjFSVSz (ORCPT + 99 others); Mon, 19 Jun 2023 17:18:55 -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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1769167869769087822?= X-GMAIL-MSGID: =?utf-8?q?1769167869769087822?= 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 inode *donor_inode, for (i = 0; i < block_len_in_page; i++) { *err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0); if (*err < 0) - break; + goto repair_branches; bh = bh->b_this_page; } - if (!*err) - *err = block_commit_write(&folio[0]->page, from, from + replaced_size); - if (unlikely(*err < 0)) - goto repair_branches; + block_commit_write(&folio[0]->page, from, from + replaced_size); /* Even in case of data=writeback it is reasonable to pin * inode to transaction, to prevent unexpected data loss */ From patchwork Mon Jun 19 21:18:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 110174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3258268vqr; Mon, 19 Jun 2023 14:26:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7A5Y9z6h5CBEDnpbhjuD/oxx14lnf0KbQbO4U0kATN++PxFr5AU9oMicEOyZ+iyoDjXrqR X-Received: by 2002:aca:1206:0:b0:398:2b60:dbf4 with SMTP id 6-20020aca1206000000b003982b60dbf4mr12544955ois.19.1687210010526; Mon, 19 Jun 2023 14:26:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687210010; cv=pass; d=google.com; s=arc-20160816; b=HXMgqfq3Y3jVoNnWczO4Zcz3tDsH4Y8W9dGP0HRVV1OaW7HAm3ZB7GI1zs7g2AeQMR UJioE0ieX8JvNp5eVX4zkfKwfBC4rfogas+iZ97foVq0A/LT8rxaZHlUX6QqnktseTrS ljX0Kdlasf2LR6f0flR3ZQyLlYtGNauo0wXZJX91kpjs0lP7NIg7oEUcol4Ze/uXTIAm SNk1t1gr2ibDua9J3KPM3+NgF7KVisFXL3mVOlVQZVMT+/xvfZGPeXx3yGDSD1YcPbHO NZVlUvlK6DmYYAYCuYmUSee+NCqSGIRFvdyT+KmY8PtlnsgV9aOdLFDBisrFLcP96iTI Zq+g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=e7SgMagTj0KzNfQID209UAiku5Vv3G7zNV+yggrUOg0=; b=0sB9egx64HCq0R6H4u+gcAI3v2tW3P/iCoMQw6HnhY49qOtIPKJDXNcubt0BmW9nxH w3atq+JM4F574b5uJv15orz6xfYCUBUY0qmGdErCzldFah8el7eENFd0HLBq2w+AdDP6 aLYA1Xbtc+BE1ezgyoKJJKP88djvqJ6gbvJkJWAfBfL3yheSSS2/zPF3cslPmG5ilIK9 5/ZBGcy73/7y/dtkz73ww8sZHLbnoZDx+WoC1koApLsW2IQeU9tMGzApJ17ZiEkTWLYR NsLkIwCucJwz/tlfBR811lxpug7KM1i9H4LUbzdw6OFWSRB5KSZvbHTgpWIRkvK1+KMI onaQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=tnMfLNKB; dkim=neutral (no key) header.i=@iokpp.de; arc=pass (i=1); 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 na18-20020a17090b4c1200b002597ed3cc4fsi541324pjb.189.2023.06.19.14.26.35; Mon, 19 Jun 2023 14:26:50 -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=@iokpp.de header.s=strato-dkim-0002 header.b=tnMfLNKB; dkim=neutral (no key) header.i=@iokpp.de; arc=pass (i=1); 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 S229650AbjFSVT0 (ORCPT + 99 others); Mon, 19 Jun 2023 17:19:26 -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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1769167923995308965?= X-GMAIL-MSGID: =?utf-8?q?1769167923995308965?= 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, /* must not update i_size! */ - ret = block_commit_write(page, block_start + 1, - block_start + 1); - if (ret < 0) - mlog_errno(ret); - else - ret = 0; + block_commit_write(page, block_start + 1, block_start + 1); } /* From patchwork Mon Jun 19 21:18:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 110175 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3258348vqr; Mon, 19 Jun 2023 14:27:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ63JXCms++LaUb9sLOxIRKLLsMKOi/EVkHSGwd+cWR0yLGTosYLRL28Q+6RI6tzMmJrRgGk X-Received: by 2002:a17:90b:3881:b0:25e:f133:41cb with SMTP id mu1-20020a17090b388100b0025ef13341cbmr5914870pjb.21.1687210028349; Mon, 19 Jun 2023 14:27:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687210028; cv=pass; d=google.com; s=arc-20160816; b=NujS9XAWdGRu3Kgzh1BbXFUG71VeFfagq2cDqLWgdrp60aZrKw53wy+ZcWFatxngPn PjOR4mNFEpX8admRVBkBbMuRF/HJPFbgXqg6cYOoIEZlPZc60IY1CVP/MlxbkPz5LdnK SeM5wzaZGw6JH5b6mBdBB8bKf84HKlBi4fsB74V40zA8NeNyPPuk2R4vjQ6hjQ+AV67i 1x0MoLlZDajVBEF4ZQ1UejpUg7dq66bjh4sdcINV3wCkhVaciOghe0EPg7nTZLLP5Mn7 J3dxw/C0x2zrbcdLEtV36YJ3qswXRO5+sNdaCFBcx5cmVkLElDE/7f+34aGxcby+ch9m e9Eg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=u8a2OuOvxT1/oVmGmWM7pshVQC/wQv12L8jJddp76/w=; b=Kbbuvuouo4waDOx3fCNYt/e5dDMRBV4NMONNpUmiU7ht0PvC7NajQ3Qpsmy1hHUVKf ITmLS1mMjIQc+T+6MyVJxsGBSkuch7NsKUD90uH2km0gNmEfQFBt1A9N5iP3+vSKOWAM t3vy0BPTRMjYtlmSPaYzpDN3zxav19QQs2vMAnj/PgG//6Q3QpZGfev+2qhiYVnLK0+s L1mDXfEqjUexFMdOG5ObrQjhVfE7cdCApH8VXk8c+NkRl/8j15AAnU/17UgAXW3Gd/Sg htKPex9SIm6ipd+F0ZOcNH/WfizkCkV9n+SnRpdAoAzS676Fnqba9SQ5ujAOyfiETA1R tfzw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=NWHvLYHV; dkim=neutral (no key) header.i=@iokpp.de; arc=pass (i=1); 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 lw13-20020a17090b180d00b0025bc4b71dd5si578789pjb.150.2023.06.19.14.26.54; Mon, 19 Jun 2023 14:27:08 -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=@iokpp.de header.s=strato-dkim-0002 header.b=NWHvLYHV; dkim=neutral (no key) header.i=@iokpp.de; arc=pass (i=1); 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 S229776AbjFSVT5 (ORCPT + 99 others); Mon, 19 Jun 2023 17:19:57 -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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1769167942658133954?= X-GMAIL-MSGID: =?utf-8?q?1769167942658133954?= 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 = PAGE_SIZE; err = __block_write_begin(page, 0, end, udf_get_block); - if (!err) - err = block_commit_write(page, 0, end); - if (err < 0) { + if (err) { unlock_page(page); ret = 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); From patchwork Mon Jun 19 21:18:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 110170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3258171vqr; Mon, 19 Jun 2023 14:26:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5g4Q2i+k8IXaNmTQzsZdDUQoZ4xOVV6gN3KkZ8OFPlpgEv6/KzMl3ebFPAaV8x0xICDvPD X-Received: by 2002:a05:6870:e295:b0:19f:808a:d2c3 with SMTP id v21-20020a056870e29500b0019f808ad2c3mr7041019oad.9.1687209995371; Mon, 19 Jun 2023 14:26:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687209995; cv=pass; d=google.com; s=arc-20160816; b=yZL34XtCz+rKZTK0K8gaEtAasm+6Ojatgq40ETCtFZa4N7KEDoksxF+l1XUncWuXlI y58PkJXYAHrpL1WBeOyYIE6yzAs/LY/UrtYpGykyF0J7N2ZoT/AsP8F1H7gZDSxxHq4D mpNT79VMSRr7iqzzbBuou/NrF0BirDBRp0JKYn46d7+c1f1C/2qt1I493Wn1x+lkZB1/ 9GWe4isZVTKH++L8uCvyUigcTSVke+VY0JRDy18zP8drEkcZ5ts1ELpW7pxPX0T9lPoK rrUYyU7xjuZP9lsoaTAdhJeyEJ2n0iyvDTUVzR3h85obzz6a6pDZoAZsevHKsQdegOMF 4Cpg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=4VoCJCkUkGyuMs9ktPD9dGvwPKJ6aIyifN3L5LWABx8=; b=0aJr+dw8EFg5GjB1pZdbIaP2qaq2kKMJB0KhF5PaXgUHpEc74O1mYp7pS01toodUVg qyxEiTHZzo69ROmMY5EFmyAP6KCnZElE8DnAx7fKDj8cVC+JylcmLfqQOjKsJ6EmaTI/ Gkk/+X+7kpx4jnSHhR6GhJ59aXAU/zThPOMo6EPpLI+Q/TN6UVkFffM2M5kNRWqWrYTt LsCuyB6meMXh5gp0U9ZWiuf3LAtYIRM6q6GMHvNCY0AvUODSVf/1d7N+48aEX19Qzlw/ 72U2fOPeS49WLRJvVX+uMZ7vgT0wCzWzRcI9j0UFIPAif3nbmb+Ewp48991ZWbOXVI2b c0Gw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@iokpp.de header.s=strato-dkim-0002 header.b=GQuLI20i; dkim=neutral (no key) header.i=@iokpp.de; arc=pass (i=1); 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 l69-20020a638848000000b005133c334fe9si250021pgd.847.2023.06.19.14.26.21; Mon, 19 Jun 2023 14:26:35 -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=@iokpp.de header.s=strato-dkim-0002 header.b=GQuLI20i; dkim=neutral (no key) header.i=@iokpp.de; arc=pass (i=1); 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 S229836AbjFSVTc (ORCPT + 99 others); Mon, 19 Jun 2023 17:19:32 -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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1769167908082833183?= X-GMAIL-MSGID: =?utf-8?q?1769167908082833183?= 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); -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 = 0; @@ -2151,7 +2151,6 @@ int block_commit_write(struct page *page, unsigned int from, unsigned int to) */ if (!partial) SetPageUptodate(page); - return 0; } EXPORT_SYMBOL(block_commit_write); @@ -2577,11 +2576,11 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, end = PAGE_SIZE; ret = __block_write_begin(page, 0, end, get_block); - if (!ret) - ret = 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_space *, 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 */