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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21000C6FA82 for ; Sun, 25 Sep 2022 13:33:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7A118D0006; Sun, 25 Sep 2022 09:33:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A2ADE8D0001; Sun, 25 Sep 2022 09:33:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87CBD8D0006; Sun, 25 Sep 2022 09:33:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 79C978D0001 for ; Sun, 25 Sep 2022 09:33:46 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 575241A0A6F for ; Sun, 25 Sep 2022 13:33:46 +0000 (UTC) X-FDA: 79950700452.18.8A7A3FF Received: from mail1.bemta32.messagelabs.com (mail1.bemta32.messagelabs.com [195.245.230.2]) by imf02.hostedemail.com (Postfix) with ESMTP id CD50180002 for ; Sun, 25 Sep 2022 13:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1664112824; i=@fujitsu.com; bh=RdaWcPr3gci1Vc3szH+WaTgenDw7Cl3lU3kCYuJ1P+s=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=j8263QtK0f5wm59RNEGSfG82S3agxGs5ABCRhHJCo106ExtmIMli6uy4b4qX/iD/u zyG+/kmbH+0cNtkoGeQ2avr6FmWLelWB68MWk6Sv2fPFfoHCNqdjmHN3hvLKjoXu8Z RQfiMPS4qNnd/3X34p2HlmBYHb77dpbPVsUPvGfPXM5QQLQUrjuqZPzO91nPHW7u+w ZaefB1FGzIdIcGXpr1ovY+Zckxk5Qu++hYRtsmuGlnTu35vWzvfpUybjmFaVYmlh8E TZBMZ5C9lrqJqMVzFtRz5q9l7VJQisk0PXIlJ/nyNrM0q86SYf+YVOiQiYApr61UyW Kq24kixbDB7Ag== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPKsWRWlGSWpSXmKPExsViZ8ORqLstwiD ZYOUzHYvpUy8wWmw5do/R4vITPovTExYxWezZe5LF4vKuOWwW99b8Z7XY9WcHu8XKH39YHTg9 Ti2S8Ni8Qstj8Z6XTB6bVnWyeWz6NInd48XmmYwenzfJBbBHsWbmJeVXJLBm7J9xkrFgIk9F+ 4129gbGPq4uRi4OIYEtjBI7nt9hgXCWM0lMmnKFCcLZyyixfON3xi5GTg42AR2JCwv+soIkRA QmMUocu3GTGSTBLJAg0f7lGhOILSxgLzHnw1GwOIuAqsSBU01gzbwCLhKXvixnAbElBBQkpjx 8D1bDKeAqsXTKKrBeIaCanr1nmSDqBSVOznzCAjFfQuLgixdA9RxAvUoSM7vjIcZUSDROP8QE YatJXD23iXkCo+AsJN2zkHQvYGRaxWiVVJSZnlGSm5iZo2toYKBraGiqa6hrZGiul1ilm6iXW qpbnlpcomuol1herJdaXKxXXJmbnJOil5dasokRGEspxYw3dzC29v3UO8QoycGkJMp71M8gWY gvKT+lMiOxOCO+qDQntfgQowwHh5IE7wE3oJxgUWp6akVaZg4wrmHSEhw8SiK8hSCtvMUFibn FmekQqVOMxhxrGw7sZeaYOvvffmYhlrz8vFQpcd6V4UClAiClGaV5cINg6eYSo6yUMC8jAwOD EE9BalFuZgmq/CtGcQ5GJWFet2CgKTyZeSVw+14BncIEdIodnz7IKSWJCCmpBiaOA/pZz7f/D Iv6Fr7g8HIBh6TXK6faKgkdniolFCUtvOmRWtjb3pj0aoH7alKzGO6oCXgd3NfZKmDgfrPn8K WM9R9r06p5bVf9821weHDNyuGkVpl4y4U/R7V+T1zQvMkl0+9X1/a+gMff95mEPmueYLFJzsF gxQ/bna8XrLtUNvlTjzrfUsFZUjXbZ1b82vaDJVZ7ilOY6s/T28rCn7XX26+PyQ3O2vx9e27x v7bVHG8stXc/83mjbr8jxsa5oZnZr3Pj6QXnO5oC7vZMfvvH1mZe1pGSSA5m84laCnc4V5+7P Vt4/t//lkschA7O/pG8+VtxMMedVI6EiBulAgV9ty0W3nx0ZsrqeftLpASUWIozEg21mIuKEw E7hM7ssgMAAA== X-Env-Sender: ruansy.fnst@fujitsu.com X-Msg-Ref: server-21.tower-591.messagelabs.com!1664112822!124698!1 X-Originating-IP: [62.60.8.97] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.87.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24092 invoked from network); 25 Sep 2022 13:33:42 -0000 Received: from unknown (HELO n03ukasimr01.n03.fujitsu.local) (62.60.8.97) by server-21.tower-591.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 25 Sep 2022 13:33:42 -0000 Received: from n03ukasimr01.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr01.n03.fujitsu.local (Postfix) with ESMTP id 470F5100194; Sun, 25 Sep 2022 14:33:42 +0100 (BST) Received: from R01UKEXCASM121.r01.fujitsu.local (R01UKEXCASM121 [10.183.43.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr01.n03.fujitsu.local (Postfix) with ESMTPS id 3A53610018D; Sun, 25 Sep 2022 14:33:42 +0100 (BST) Received: from localhost.localdomain (10.167.225.141) by R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Sun, 25 Sep 2022 14:33:38 +0100 From: Shiyang Ruan To: , , , , CC: , , , Subject: [PATCH 1/3] xfs: fix the calculation of length and end Date: Sun, 25 Sep 2022 13:33:21 +0000 Message-ID: <1664112803-57-2-git-send-email-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1664112803-57-1-git-send-email-ruansy.fnst@fujitsu.com> References: <1664112803-57-1-git-send-email-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.167.225.141] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) X-Virus-Scanned: ClamAV using ClamSMTP ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664112826; a=rsa-sha256; cv=none; b=FKn9vf5icdexAPYDxXIalg9zxNMm1KF5P9KRtZ1hodP7fVqZIpzq+3k33IKZmbmLOMN6wb Xpz5pRa8ZGwTOo4Tgzt62eFP95PA3xw++Aw4w48bH2v5txFVm4V0csakt1a/mXapyZ5Ll5 y3WhbnEzOsVDGDuaagcIw+QqZp8hpRg= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=fujitsu.com header.s=170520fj header.b=j8263QtK; spf=pass (imf02.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 195.245.230.2 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com; dmarc=pass (policy=none) header.from=fujitsu.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664112826; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RdaWcPr3gci1Vc3szH+WaTgenDw7Cl3lU3kCYuJ1P+s=; b=8ntC6wUKIHrXyIcPboWBXXin0bmOg76eseCVQ1nJktuvzQRry1GcOcqsc7EqX2JvQ7Jb3C OJ87JG2r6grRpUv+V3a0G30bNTTrzKotVIwUfw+rYj/Alrw62SnOs2S03uI2VpLatfA04Y tuoWWQixtnDa44mIpxkEo0tALNTOFlo= X-Stat-Signature: kzbhxh7rwmyrqsd6zjjt9wqj3durfdda X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=fujitsu.com header.s=170520fj header.b=j8263QtK; spf=pass (imf02.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 195.245.230.2 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com; dmarc=pass (policy=none) header.from=fujitsu.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: CD50180002 X-HE-Tag: 1664112825-521762 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The end should be start + length - 1. Also fix the calculation of the length when seeking for intersection of notify range and device. Signed-off-by: Shiyang Ruan Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_notify_failure.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_notify_failure.c b/fs/xfs/xfs_notify_failure.c index c4078d0ec108..3830f908e215 100644 --- a/fs/xfs/xfs_notify_failure.c +++ b/fs/xfs/xfs_notify_failure.c @@ -114,7 +114,7 @@ xfs_dax_notify_ddev_failure( int error = 0; xfs_fsblock_t fsbno = XFS_DADDR_TO_FSB(mp, daddr); xfs_agnumber_t agno = XFS_FSB_TO_AGNO(mp, fsbno); - xfs_fsblock_t end_fsbno = XFS_DADDR_TO_FSB(mp, daddr + bblen); + xfs_fsblock_t end_fsbno = XFS_DADDR_TO_FSB(mp, daddr + bblen - 1); xfs_agnumber_t end_agno = XFS_FSB_TO_AGNO(mp, end_fsbno); error = xfs_trans_alloc_empty(mp, &tp); @@ -210,7 +210,7 @@ xfs_dax_notify_failure( ddev_end = ddev_start + bdev_nr_bytes(mp->m_ddev_targp->bt_bdev) - 1; /* Ignore the range out of filesystem area */ - if (offset + len < ddev_start) + if (offset + len - 1 < ddev_start) return -ENXIO; if (offset > ddev_end) return -ENXIO; @@ -222,8 +222,8 @@ xfs_dax_notify_failure( len -= ddev_start - offset; offset = 0; } - if (offset + len > ddev_end) - len -= ddev_end - offset; + if (offset + len - 1 > ddev_end) + len -= offset + len - 1 - ddev_end; return xfs_dax_notify_ddev_failure(mp, BTOBB(offset), BTOBB(len), mf_flags); -- 2.37.3