From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E15FC433DF for ; Mon, 12 Oct 2020 13:41:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 569672222F for ; Mon, 12 Oct 2020 13:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510119; bh=Ccz4JWh+v4134ZyEbJ2S3IXk2/venNaodAGSpyjqWwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j0wPQZW+w1FWj7pSxv8Yxe6OaMn3lxGIMSsP2Eepm4+4LMDBx0dBBn14ss5fENbzE 4C5wLs7b2VMtW2qIitgD33XKAlflmSYl+m/rd0wuttkvFMmSOCXSA1Vsbv6M+pAeCO m91mWWkMNeHdxyzzj/4eAn4jWHDZXNdAmx1yZa+g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731489AbgJLNl5 (ORCPT ); Mon, 12 Oct 2020 09:41:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:45618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389108AbgJLNlL (ORCPT ); Mon, 12 Oct 2020 09:41:11 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F4BD2076E; Mon, 12 Oct 2020 13:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510070; bh=Ccz4JWh+v4134ZyEbJ2S3IXk2/venNaodAGSpyjqWwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fKtczoa5ImfixHfEkB5l3BqTblp58vAOaO+AY9rV6TIsSyWF1aTHNj3Q3Tqm56sAF Z/WUrkETnHkDSUVCnPBhEk1nbLdIwCHFxFT+zeuWr78KkZ8ASB79RaulN9QtugS0GK omFD53hhvb3orI6R+DcAOnSPPacUUMLe+B0AI0BQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Josef Bacik , Qu Wenruo , David Sterba , Anand Jain Subject: [PATCH 5.4 28/85] btrfs: volumes: Use more straightforward way to calculate map length Date: Mon, 12 Oct 2020 15:26:51 +0200 Message-Id: <20201012132634.207705689@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132632.846779148@linuxfoundation.org> References: <20201012132632.846779148@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: Qu Wenruo commit 2d974619a77f106f3d1341686dea95c0eaad601f upstream. The old code goes: offset = logical - em->start; length = min_t(u64, em->len - offset, length); Where @length calculation is dependent on offset, it can take reader several more seconds to find it's just the same code as: offset = logical - em->start; length = min_t(u64, em->start + em->len - logical, length); Use above code to make the length calculate independent from other variable, thus slightly increase the readability. Reviewed-by: Johannes Thumshirn Reviewed-by: Josef Bacik Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Anand Jain Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/volumes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5714,7 +5714,7 @@ static int __btrfs_map_block_for_discard } offset = logical - em->start; - length = min_t(u64, em->len - offset, length); + length = min_t(u64, em->start + em->len - logical, length); stripe_len = map->stripe_len; /*