[PATCH] jfs: jfs_xtree: replace XT_GETPAGE macro with xt_getpage() function

From: Suchit Karunakaran
Date: Mon Mar 03 2025 - 00:23:20 EST


Reported-by: kernel test robot <lkp@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202503030707.dKjJdF6z-lkp@xxxxxxxxx/

Signed-off-by: Suchit Karunakaran <suchitkarunakaran@xxxxxxxxx>
---
fs/jfs/jfs_xtree.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index fb736a06ea58..fa4f77b436f0 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -115,7 +115,7 @@ static inline int xt_getpage(struct inode **ip, s64 bn, struct metapage **mp,
{
int rc;

- BT_GETPAGE(ip, bn, *mp, xtpage_t, size, *p, rc, i_xtroot);
+ BT_GETPAGE(*ip, bn, *mp, xtpage_t, size, *p, rc, i_xtroot);

if (!rc) {
if ((le16_to_cpu((*p)->header.nextindex) < XTENTRYSTART) ||
@@ -123,7 +123,7 @@ static inline int xt_getpage(struct inode **ip, s64 bn, struct metapage **mp,
le16_to_cpu((*p)->header.maxentry)) ||
(le16_to_cpu((*p)->header.maxentry) >
((bn == 0) ? XTROOTMAXSLOT : PSIZE >> L2XTSLOTSIZE))) {
- jfs_error(ip->i_sb, "xt_getpage: xtree page corrupt\n");
+ jfs_error((*ip)->i_sb, "xt_getpage: xtree page corrupt\n");
BT_PUTPAGE(*mp);
*mp = NULL;
rc = -EIO;
@@ -270,7 +270,7 @@ static int xtSearch(struct inode *ip, s64 xoff, s64 *nextp,
*/
for (bn = 0;;) {
/* get/pin the page to search */
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -825,7 +825,7 @@ xtSplitUp(tid_t tid,
* insert router entry in parent for new right child page <rp>
*/
/* get/pin the parent page <sp> */
- rc = xt_getpage(ip, parent->bn, &smp, PSIZE, &sp);
+ rc = xt_getpage(&ip, parent->bn, &smp, PSIZE, &sp);
if (rc) {
XT_PUTPAGE(rcmp);
return rc;
@@ -1080,7 +1080,7 @@ xtSplitPage(tid_t tid, struct inode *ip,
* update previous pointer of old next/right page of <sp>
*/
if (nextbn != 0) {
- rc = xt_getpage(ip, nextbn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, nextbn, &mp, PSIZE, &p);
if (rc) {
XT_PUTPAGE(rmp);
goto clean_up;
@@ -1435,7 +1435,7 @@ int xtExtend(tid_t tid, /* transaction id */
return rc;

/* get back old page */
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;
/*
@@ -1451,7 +1451,7 @@ int xtExtend(tid_t tid, /* transaction id */
XT_PUTPAGE(mp);

/* get new child page */
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -1729,7 +1729,7 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)
return rc;

/* get back old page */
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;
/*
@@ -1745,7 +1745,7 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)
XT_PUTPAGE(mp);

/* get new child page */
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -1806,7 +1806,7 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)
XT_PUTPAGE(mp);

/* get new right page */
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -1882,7 +1882,7 @@ printf("xtUpdate.updateLeft.split p:0x%p\n", p);
return rc;

/* get back old page */
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -1899,7 +1899,7 @@ printf("xtUpdate.updateLeft.split p:0x%p\n", p);
XT_PUTPAGE(mp);

/* get new child page */
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -2286,7 +2286,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
* first access of each page:
*/
getPage:
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -2524,7 +2524,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)

/* get back the parent page */
bn = parent->bn;
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -2809,7 +2809,7 @@ s64 xtTruncate_pmap(tid_t tid, struct inode *ip, s64 committed_size)
* first access of each page:
*/
getPage:
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

@@ -2854,7 +2854,7 @@ s64 xtTruncate_pmap(tid_t tid, struct inode *ip, s64 committed_size)

/* get back the parent page */
bn = parent->bn;
- rc = xt_getpage(ip, bn, &mp, PSIZE, &p);
+ rc = xt_getpage(&ip, bn, &mp, PSIZE, &p);
if (rc)
return rc;

--
2.48.1