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;
From:   Huang Jianan <huangjianan@oppo.com>
To:     linux-erofs@lists.ozlabs.org
Cc:     huangjianan@oppo.com, guoweichao@oppo.com, zhangshiming@oppo.com,
        linux-kernel@vger.kernel.org
Subject: [PATCH v3] erofs: avoiding using generic_block_bmap
Date:   Tue,  8 Dec 2020 21:11:08 +0800
Message-Id: <20201208131108.7607-1-huangjianan@oppo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (58.252.5.72) by HKAPR03CA0025.apcprd03.prod.outlook.com (2603:1096:203:c9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.7 via Frontend Transport; Tue, 8 Dec 2020 13:11:20 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 575dacd1-8846-477f-0713-08d89b7ac1a5
X-MS-TrafficTypeDiagnostic: SG2PR02MB2559:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <SG2PR02MB2559CBE36D3B22D04AD78AC4C3CD0@SG2PR02MB2559.apcprd02.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:525;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Si0JVNV3DVO2u3bVyi8HBuoVQYOZWO4YGdGGB9Vrm1eSUzcpw7a0sBFLseoXeoUSEvgQZpssSgCOp+U0/gT9s30XKTQRng+ENq+GqrPTXyU23Xi/0a0zInlBcuCwcKH9Qmdn4f29srHCqQ9XK9oDfYum5/D+F1+Mm6ZKHlbqTP52N7KQNTdVlp8/CkbRz3Tv6xTwe21GurniDCzDSnCJHJ0joUr+Qcvosu1TFdiS6am4VMn82EykL4f92pGxaM6n8GagTxSKJ3eMab2/+dk+yOY9/r9MGHAS3cZCoxPMNQCz5twBQ1ocrrz+4R9tOMK8wWalsZ2+ziWvrNXAlbH9aZmNk6CgVSoXi4/mRsl6MeeyQ6yGFtGXHWZIaQKToaTwG/J4fBIqZ+41ayeMR8QRl/eh3lGmis7PP5ni7Bl6X0e9dKpd9QsqHndrc2sjUdrVt5NynwqdBYuarPGCiZUpSQ==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SG2PR02MB4108.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(136003)(366004)(346002)(4326008)(8676002)(2906002)(16526019)(186003)(6486002)(6916009)(6666004)(83380400001)(52116002)(8936002)(69590400008)(86362001)(66946007)(6512007)(34490700003)(5660300002)(36756003)(66556008)(1076003)(26005)(508600001)(956004)(2616005)(66476007)(6506007)(41533002)(11606006);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?NayTG/iDJTk1mvAGGGv+zc4fPpLc17BW12+LC3LVDJprAN2Grk8BdDk9hwpO?=
 =?us-ascii?Q?KXfnp9nytBFHGQtYeiWSCyx7HDkub3UfZm2vWtTaEWq7hQ4Y/T+Ir6Fu2E3r?=
 =?us-ascii?Q?MT6Avw+A9GZIiKLDTjpTokq122LTpXXlPYUdQPFAby2Omtr+k7tKx4n8vH2z?=
 =?us-ascii?Q?fEBtVwvUcsXo8/lsCob66nq5F9Rc3zRPWU+6/reyr72Kb93VuvKqMzaEx7lf?=
 =?us-ascii?Q?M5sp6du8irQ8qD51wy6lAGqGmnQeWCy1V0NKwx1wyCk09lP8IGJ1yKGeSF8t?=
 =?us-ascii?Q?wmL4pDpJEb1MSerfZmQnmZzsOO5DAs8CMiVytGr3aKOHQdZ+3TjdnS462qrU?=
 =?us-ascii?Q?T4EOYi68E3XtkaYoWB0znNi6AOOwM2fcQgBMSxPbET6sf9e8jL7Ka+RnFuI4?=
 =?us-ascii?Q?bc4iDZB/HZ15QFnQtgIswvnj7eX/3jvA8DOpKvYQkwbNSlbl1esEaBKESMBx?=
 =?us-ascii?Q?6BAbC189WJKdE1RthDJV2v5D8YV1VDAIAbd8WD91Sin0uV1xmWArBYgCqrbH?=
 =?us-ascii?Q?t3pZyQAM24J7IFvu3XMiowjxN3EOgJrUEGffzn7b2Q/1pIqCXn55jkw0W93s?=
 =?us-ascii?Q?pWjbRzu1EBky8/CCMVvlc6ClAPf5V6bbH2lj4I2Fyc9yWooQeqffuO0PGUFc?=
 =?us-ascii?Q?O7BJwKOkUP2rCq8wd6vDCVzMeGk7y4/t3jeE/8F6GqNcEG08hJw9WqwgzYp4?=
 =?us-ascii?Q?yBMqNGGNJJIhXt5LS72eo9WYFeV5+9w65wRyTuyEYz/SlgFolkUIcWVXvqUv?=
 =?us-ascii?Q?GoY9jiYxSGNcEjg0QQAe0EiXYSnu8Fx64q/ZGqVG4R7xZRf0FoHXwH6Pq4fr?=
 =?us-ascii?Q?tsqFlBKu8U9cO6mXf/+Du5ce4jV50MK5JD7XKrS0mNjt+j+Gek6Yn8Lqr2JP?=
 =?us-ascii?Q?ZMS4Vdf+G0hoWjuidG09GpmMm7wb5k3sdsBA/QMkmrM9L2NNUXh6E2aMSmq1?=
 =?us-ascii?Q?N6w5FGztoxeBPPR4xSGkARaY3+y8HVRcAkMzdcpeAZo=3D?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 575dacd1-8846-477f-0713-08d89b7ac1a5
X-MS-Exchange-CrossTenant-AuthSource: SG2PR02MB4108.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2020 13:11:21.2517
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: nKkouskF8/mUBffIsh/BK4BWPHuhD22RCR9G0YZAw9bAil5xtVsp93CrtWpoPm+tU5ugGkz142gnsHF11zXR+w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR02MB2559
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

iblock indicates the number of i_blkbits-sized blocks rather than
sectors.

In addition, considering buffer_head limits mapped size to 32-bits,
should avoid using generic_block_bmap.

Fixes: 9da681e017a3 ("staging: erofs: support bmap")
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Guo Weichao <guoweichao@oppo.com>
---
 fs/erofs/data.c | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index 347be146884c..399ffd857c50 100644
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -312,36 +312,26 @@ static void erofs_raw_access_readahead(struct readahead_control *rac)
 		submit_bio(bio);
 }
 
-static int erofs_get_block(struct inode *inode, sector_t iblock,
-			   struct buffer_head *bh, int create)
-{
-	struct erofs_map_blocks map = {
-		.m_la = iblock << 9,
-	};
-	int err;
-
-	err = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW);
-	if (err)
-		return err;
-
-	if (map.m_flags & EROFS_MAP_MAPPED)
-		bh->b_blocknr = erofs_blknr(map.m_pa);
-
-	return err;
-}
-
 static sector_t erofs_bmap(struct address_space *mapping, sector_t block)
 {
 	struct inode *inode = mapping->host;
+	struct erofs_map_blocks map = {
+		.m_la = blknr_to_addr(iblock),
+	};
+	sector_t blknr = 0;
 
 	if (EROFS_I(inode)->datalayout == EROFS_INODE_FLAT_INLINE) {
 		erofs_blk_t blks = i_size_read(inode) >> LOG_BLOCK_SIZE;
 
 		if (block >> LOG_SECTORS_PER_BLOCK >= blks)
-			return 0;
+			goto out;
 	}
 
-	return generic_block_bmap(mapping, block, erofs_get_block);
+	if (!erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW))
+		blknr = erofs_blknr(map.m_pa);
+
+out:
+	return blknr;
 }
 
 /* for uncompressed (aligned) files and raw access for other files */
-- 
2.25.1