gfs2: Add metapath_dibh helper

Andreas Gruenbacher · Andreas Gruenbacher · commit 92099f0c9227 · 2023-11-02T20:10:00.000+01:00
Add a metapath_dibh() helper for extracting the inode's buffer head from
a metapath.

Signed-off-by: Andreas Gruenbacher &lt;agruenba@redhat.com&gt;
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
@@ -317,6 +317,12 @@ static void gfs2_metapath_ra(struct gfs2_glock *gl, __be64 *start, __be64 *end)
 	}
 }
 
+static inline struct buffer_head *
+metapath_dibh(struct metapath *mp)
+{
+	return mp->mp_bh[0];
+}
+
 static int __fillup_metapath(struct gfs2_inode *ip, struct metapath *mp,
 			     unsigned int x, unsigned int h)
 {
@@ -659,7 +665,7 @@ static int __gfs2_iomap_alloc(struct inode *inode, struct iomap *iomap,
 {
 	struct gfs2_inode *ip = GFS2_I(inode);
 	struct gfs2_sbd *sdp = GFS2_SB(inode);
-	struct buffer_head *dibh = mp->mp_bh[0];
+	struct buffer_head *dibh = metapath_dibh(mp);
 	u64 bn;
 	unsigned n, i, blks, alloced = 0, iblks = 0, branch_start = 0;
 	size_t dblks = iomap->length >> inode->i_blkbits;

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,12 @@ static void gfs2_metapath_ra(struct gfs2_glock gl, __be64 start, __be64 *end)`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`
	`320`	`+static inline struct buffer_head *`
	`321`	`+metapath_dibh(struct metapath *mp)`
	`322`	`+{`
	`323`	`+ return mp->mp_bh[0];`
	`324`	`+}`
	`325`	`+`
`320`	`326`	`static int __fillup_metapath(struct gfs2_inode ip, struct metapath mp,`
`321`	`327`	`unsigned int x, unsigned int h)`
`322`	`328`	`{`
`@@ -659,7 +665,7 @@ static int __gfs2_iomap_alloc(struct inode inode, struct iomap iomap,`
`659`	`665`	`{`
`660`	`666`	`struct gfs2_inode *ip = GFS2_I(inode);`
`661`	`667`	`struct gfs2_sbd *sdp = GFS2_SB(inode);`
`662`		`- struct buffer_head *dibh = mp->mp_bh[0];`
	`668`	`+ struct buffer_head *dibh = metapath_dibh(mp);`
`663`	`669`	`u64 bn;`
`664`	`670`	`unsigned n, i, blks, alloced = 0, iblks = 0, branch_start = 0;`
`665`	`671`	`size_t dblks = iomap->length >> inode->i_blkbits;`