Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3353365pxb; Mon, 17 Jan 2022 18:23:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+qDAWFZCV3daHE8sHoXdu5wCGxTej+OIdnLDbBDrYiIv3TQEfTgsWSMrOMtbpzSqtVm2n X-Received: by 2002:a17:902:b184:b0:149:be5f:c6f3 with SMTP id s4-20020a170902b18400b00149be5fc6f3mr24865978plr.174.1642472590669; Mon, 17 Jan 2022 18:23:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642472590; cv=none; d=google.com; s=arc-20160816; b=p/nfSPrCfFQ/XjJUUMyY1eRSYHUcukzbdEwsAXUe8HUYbRKYoEFAlP6B9rlASYW3WI /El8OvUxmM8aFP6pnA7ACQm/mQR4UXxAHIkAPGYDc6eQruc5Cn7YKppz2XgCdiNqaYPj 5KPI7V7y3pzfF7S5nUZWRFbelm2C3M2MTy4FJEpkaUACRVUXPBQDfZdMNZa3pbP2wxV/ bkVG/6+uaJJX0bob0HYSPiLuqwejsOuGy57djClQ6bVnFFt2zYAXbLTv34HCOWnaegiU waDxFhNqLhaAUD5rVSPA6G3ceRSeYl544g3AN6LPKm68mwQoLciQmRTO5smmDdzW+yAO LVxg== ARC-Message-Signature: i=1; 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; bh=yZF6/VC61RuhhzAdKtb2V4MjJfh5hgy1HqYC11csIvA=; b=koqLoHUBEyCTa9SKYs+CCjbYNcTWxx9DhcpSj0edY49Bk6wgWR/O0YAcBcqUK85JjJ yEnMd8/C8+SggOIMBs/660kcNdp5SvRysM/oGDDPd5JuxL9zuXWOeq0joA6Dk5mmmDfG M4O10kcZWusq80SITIls/UOuajMmVFJcXdfnGLuVvIV1PMn0W5EfKEEKrAf1+DLprqN9 QJqQ1Y7k3NRhj1RmwhGVi2GXYqhlIeTu0YloS6A5vTUVaHSbb4q+U9m2+mRNWJ1gWXDv oUf8I02Vh3mr0CKnCkgvMzKgZX0B1fGp6oelNYGr/yD6CJGAPYpvvSuY/eDe0tG1FND8 gOgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=IwrAixKb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f67si5571194pgc.410.2022.01.17.18.22.58; Mon, 17 Jan 2022 18:23:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=IwrAixKb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239716AbiAQMMU (ORCPT + 99 others); Mon, 17 Jan 2022 07:12:20 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:41418 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S239654AbiAQMMR (ORCPT ); Mon, 17 Jan 2022 07:12:17 -0500 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 20HAw0nx008699; Mon, 17 Jan 2022 12:12:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=yZF6/VC61RuhhzAdKtb2V4MjJfh5hgy1HqYC11csIvA=; b=IwrAixKb+9G12FaZI2hzVb1RjLI3azEovVgdo7prHKE3Om/ssI7zF9Zv3yuqfDSQtdnn YbBgQNAk14DePUjp19hy+RFbGV0lAe1HzARDhLg+skXHNZ18rdiudrDJXaDbaUr3UbOq 2tQYuh4VEuRsXU3ipJ9zP6/xNW7b8jDwjpB+cBSrnoukyMwutKbOeAKMbBuT9v4YI/ND NKdPzCGElYi+wARphzbGcbJ1p4qQm2kKKpJLpSl5WSm/oScRaUG+mY0BjA3bNU/hjpKU N0v8Sbuan2TqzRQc7WtSgcXCPdwa0lUYWAwPyGzwBcH0pD7mV7Bu2HOOZmtGgrrTqLYI Jw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3dn75vsj5d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jan 2022 12:12:07 +0000 Received: from m0098420.ppops.net (m0098420.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 20HB1Kat021559; Mon, 17 Jan 2022 12:12:06 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0b-001b2d01.pphosted.com with ESMTP id 3dn75vsj4u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jan 2022 12:12:06 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 20HC71ZC007832; Mon, 17 Jan 2022 12:12:05 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma05fra.de.ibm.com with ESMTP id 3dknw8jwqr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jan 2022 12:12:05 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 20HCC2Gw42008858 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Jan 2022 12:12:02 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 91063A404D; Mon, 17 Jan 2022 12:12:02 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2B191A405E; Mon, 17 Jan 2022 12:12:02 +0000 (GMT) Received: from localhost (unknown [9.43.45.117]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 17 Jan 2022 12:12:01 +0000 (GMT) From: Ritesh Harjani To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Andreas Dilger , tytso@mit.edu, Eric Whitney , Ritesh Harjani , Jan Kara Subject: [PATCHv2 2/5] ext4: Remove redundant max inline_size check in ext4_da_write_inline_data_begin() Date: Mon, 17 Jan 2022 17:41:48 +0530 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: efIZuGDWsOUStvoBvl7uX2Cu3_GJyhJN X-Proofpoint-GUID: nWIRPvrCUGFfqQCFPn4rV1rUh8BBz6pA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-17_04,2022-01-14_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 phishscore=0 mlxscore=0 suspectscore=0 adultscore=0 clxscore=1015 mlxlogscore=625 impostorscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201170077 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ext4_prepare_inline_data() already checks for ext4_get_max_inline_size() and returns -ENOSPC. So there is no need to check it twice within ext4_da_write_inline_data_begin(). This patch removes the extra check. It also makes it more clean. No functionality change in this patch. Signed-off-by: Ritesh Harjani Reviewed-by: Jan Kara --- fs/ext4/inline.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index d091133a4b46..cbdd84e49f2c 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -911,7 +911,7 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping, struct page **pagep, void **fsdata) { - int ret, inline_size; + int ret; handle_t *handle; struct page *page; struct ext4_iloc iloc; @@ -928,14 +928,9 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping, goto out; } - inline_size = ext4_get_max_inline_size(inode); - - ret = -ENOSPC; - if (inline_size >= pos + len) { - ret = ext4_prepare_inline_data(handle, inode, pos + len); - if (ret && ret != -ENOSPC) - goto out_journal; - } + ret = ext4_prepare_inline_data(handle, inode, pos + len); + if (ret && ret != -ENOSPC) + goto out_journal; /* * We cannot recurse into the filesystem as the transaction -- 2.31.1