gfs2: Fix iomap buffered write support for journaled files

Andreas Gruenbacher · Andreas Gruenbacher · commit dc480feb454a · 2018-10-09T18:20:13.000+02:00
Commit 64bc06b broke buffered writes to journaled files (chattr +j): we'll try to journal the buffer heads of the page being written to in gfs2_iomap_journaled_page_done. However, the iomap code no longer creates buffer heads, so we'll BUG() in gfs2_page_add_databufs. Fix that by creating buffer heads ourself when needed. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
@@ -975,6 +975,10 @@ static void gfs2_iomap_journaled_page_done(struct inode *inode, loff_t pos,
 {
 	struct gfs2_inode *ip = GFS2_I(inode);
 
+	if (!page_has_buffers(page)) {
+		create_empty_buffers(page, inode->i_sb->s_blocksize,
+				     (1 << BH_Dirty)|(1 << BH_Uptodate));
+	}
 	gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -975,6 +975,10 @@ static void gfs2_iomap_journaled_page_done(struct inode *inode, loff_t pos,`
`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`	`+ }`
`978`	`982`	`gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied);`
`979`	`983`	`}`
`980`	`984`