diff --git linux-libre-6.12.97-gnu/Makefile linux-libre-6.12.98-gnu/Makefile
index 5717981ab9453..89576b7ad937a 100644
--- linux-libre-6.12.97-gnu/Makefile
+++ linux-libre-6.12.98-gnu/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 12
-SUBLEVEL = 97
+SUBLEVEL = 98
 EXTRAVERSION = -gnu
 NAME = Baby Opossum Posse
 
diff --git linux-libre-6.12.97-gnu/fs/ext4/ioctl.c linux-libre-6.12.98-gnu/fs/ext4/ioctl.c
index a8a024bb62b4f..e726f9dbc146d 100644
--- linux-libre-6.12.97-gnu/fs/ext4/ioctl.c
+++ linux-libre-6.12.98-gnu/fs/ext4/ioctl.c
@@ -1372,8 +1372,10 @@ group_extend_out:
 			goto mext_out;
 		}
 
-		if (file_inode(filp)->i_sb != file_inode(fd_file(donor))->i_sb)
-			return -EXDEV;
+		if (file_inode(filp)->i_sb != file_inode(fd_file(donor))->i_sb) {
+			err = -EXDEV;
+			goto mext_out;
+		}
 
 		err = mnt_want_write_file(filp);
 		if (err)
