Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'gfs2-4.19.fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Andreas writes:
"gfs2 4.19 fixes
Fix iomap buffered write support for journaled files"
* tag 'gfs2-4.19.fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: Fix iomap buffered write support for journaled files (2)
+1
-5
+1
-5
fs/gfs2/bmap.c
+1
-5
fs/gfs2/bmap.c
···
975
975
{
976
976
struct gfs2_inode *ip = GFS2_I(inode);
977
977
978
-
if (!page_has_buffers(page)) {
979
-
create_empty_buffers(page, inode->i_sb->s_blocksize,
980
-
(1 << BH_Dirty)|(1 << BH_Uptodate));
981
-
}
982
978
gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied);
983
979
}
984
980
···
1057
1061
}
1058
1062
}
1059
1063
release_metapath(&mp);
1060
-
if (gfs2_is_jdata(ip))
1064
+
if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip))
1061
1065
iomap->page_done = gfs2_iomap_journaled_page_done;
1062
1066
return 0;
1063
1067