linux-next: manual merge of the gfs2 tree with the origin tree
From: Mark Brown
Date: Tue Nov 17 2026 - 06:50:11 EST
Hi all,
Today's linux-next merge of the gfs2 tree got a conflict in:
fs/gfs2/inode.c
between commit:
9e8fc16dc6b47 ("iomap: pass iomap_iter_next_fn directly instead of struct iomap_ops")
from the origin tree and commit:
e3280ea8b7396 ("gfs2: Fix NULL pointer dereference in gfs2_seek_data/gfs2_seek_hole")
from the gfs2 tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc fs/gfs2/inode.c
index 75fb1a0c91425,d4678e4832b35..0000000000000
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@@ -2253,9 -2253,11 +2253,11 @@@ loff_t gfs2_seek_data(struct file *file
inode_lock_shared(inode);
ret = gfs2_glock_nq_init(gl, LM_ST_SHARED, 0, &gh);
- if (!ret)
- ret = iomap_seek_data(inode, offset, gfs2_iomap_next);
+ if (ret)
+ goto out;
- ret = iomap_seek_data(inode, offset, &gfs2_iomap_ops);
++ ret = iomap_seek_data(inode, offset, gfs2_iomap_next);
gfs2_glock_dq_uninit(&gh);
+ out:
inode_unlock_shared(inode);
if (ret < 0)
@@@ -2272,9 -2274,11 +2274,11 @@@ loff_t gfs2_seek_hole(struct file *file
inode_lock_shared(inode);
ret = gfs2_glock_nq_init(gl, LM_ST_SHARED, 0, &gh);
- if (!ret)
- ret = iomap_seek_hole(inode, offset, gfs2_iomap_next);
+ if (ret)
+ goto out;
- ret = iomap_seek_hole(inode, offset, &gfs2_iomap_ops);
++ ret = iomap_seek_hole(inode, offset, gfs2_iomap_next);
gfs2_glock_dq_uninit(&gh);
+ out:
inode_unlock_shared(inode);
if (ret < 0)
Attachment:
signature.asc
Description: PGP signature