Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp6128169pxv; Thu, 29 Jul 2021 07:11:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9X0rxFwNm9H6BrUJWYydClJFrddu/sC4WEeUqRJ/PfgMJUYqtzZ93TyNkFYe0SioAhLBh X-Received: by 2002:a02:a69a:: with SMTP id j26mr4627064jam.9.1627567867926; Thu, 29 Jul 2021 07:11:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627567867; cv=none; d=google.com; s=arc-20160816; b=PTgbbU6T5N+0vGMAhwSUq0fbkk0mv3aiObUwOTHHAO6u2TM9VbyMXf6gp0CDI0DeBV vMHpR9lDsjUTUfOyksSLwCuw6gq6GDZylGEZv4IIksnUhLC4I+NFiBOQUIJ2FB00ORkC A/TxXEjV54C/dCPqNHlbwMEL7C/JOZvQtfvoP1zKSJMbyNKueBV/5f/f8gcXk6YgdmdN lKyMlSBPxQPIvJMocWrOKnyfk4U9Flhf0/QnwVoQW9SA4ymKG5yaMrj0cMqsb/QtkEL5 mTJgdarla8SnrYfmxdDZ/2DW6MWrjyZlOYUAOXweRkJSnua8N6a1f5K+ovxHdhJ74Imr +I+Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jsLiQthZGREoAL7dQDqE/96d3qCrf4R4F+tBMK84gHg=; b=n/QkQdAT5kGojNj+d1QaR6SkmAdIKrjppJnX8UE+ufWxZgw+obcyj5fOtgBKRjHy24 FQ7vwkNxk00I/JQ1ExP6xWHz8gjJxsL3QtwwpADK7Qjr980VEDjedk34tiGZqNRPL+wR haA1wPzcdN++6Ifcm/6+FBjTBCnQ3o2G0OBkpcSaD3BrGaRyecAhdY6DeNBOqj/u60hX eql+hF4WkeZ5cRh8EyaS8PlpOHXw9vNhpQqedGVnSwLGlSJip9qCNr7L61Nyo5FXS+lV YsiMlF2LgQ93dXWT33ENmzEUPwm7Zb8jiuxSv9Reo1CEGIFuQR54oxTUrmCo0SnSIzjl tXrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JeUhMtWm; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z17si3290536jao.13.2021.07.29.07.10.55; Thu, 29 Jul 2021 07:11:07 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=JeUhMtWm; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239378AbhG2OIi (ORCPT + 99 others); Thu, 29 Jul 2021 10:08:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:48218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238114AbhG2N7c (ORCPT ); Thu, 29 Jul 2021 09:59:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D363E60EE2; Thu, 29 Jul 2021 13:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627567163; bh=+tUf8UsEFsnhIbkN1zSKvp4omNtzqg1OVxJOYm4VOpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JeUhMtWm4f/1TQw5cOVFaxN/lUNa5+82R1mEK4cSoyey28a+I8jxodNJsGsOVZ7Pw m/AjTaQKLfrYySmhllicqkqbF6usOX8IfUkZ7IGCen2kbaJVaruwt9PzzTMpfnMnA5 o9cKQCCn1Hwgu7c0aSLsUJQ+dqIsAvsqLi319aHU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christoph Hellwig , "Leizhen (ThunderTown)" , "Darrick J. Wong" , "Matthew Wilcox (Oracle)" , Sasha Levin Subject: [PATCH 5.13 20/22] iomap: remove the length variable in iomap_seek_hole Date: Thu, 29 Jul 2021 15:54:51 +0200 Message-Id: <20210729135137.962725840@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729135137.336097792@linuxfoundation.org> References: <20210729135137.336097792@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Hellwig [ Upstream commit 49694d14ff68fa4b5f86019dbcfb44a8bd213e58 ] The length variable is rather pointless given that it can be trivially deduced from offset and size. Also the initial calculation can lead to KASAN warnings. Signed-off-by: Christoph Hellwig Reported-by: Leizhen (ThunderTown) Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Reviewed-by: Matthew Wilcox (Oracle) Signed-off-by: Sasha Levin --- fs/iomap/seek.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c index 50b8f1418f26..ce6fb810854f 100644 --- a/fs/iomap/seek.c +++ b/fs/iomap/seek.c @@ -35,23 +35,20 @@ loff_t iomap_seek_hole(struct inode *inode, loff_t offset, const struct iomap_ops *ops) { loff_t size = i_size_read(inode); - loff_t length = size - offset; loff_t ret; /* Nothing to be found before or beyond the end of the file. */ if (offset < 0 || offset >= size) return -ENXIO; - while (length > 0) { - ret = iomap_apply(inode, offset, length, IOMAP_REPORT, ops, - &offset, iomap_seek_hole_actor); + while (offset < size) { + ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT, + ops, &offset, iomap_seek_hole_actor); if (ret < 0) return ret; if (ret == 0) break; - offset += ret; - length -= ret; } return offset; -- 2.30.2