Merge tag 'gfs2-4.19.fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

gregkh · gregkh · commit ed66c252d916 · 2018-10-13T09:06:27.000+02:00
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)
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
@@ -975,10 +975,6 @@ 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);
 }
 
@@ -1061,7 +1057,7 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos,
 		}
 	}
 	release_metapath(&mp);
-	if (gfs2_is_jdata(ip))
+	if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip))
 		iomap->page_done = gfs2_iomap_journaled_page_done;
 	return 0;
 

Original file line number	Diff line number	Diff line change
`@@ -975,10 +975,6 @@ 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`		`- }`
`982`	`978`	`gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied);`
`983`	`979`	`}`
`984`	`980`
`@@ -1061,7 +1057,7 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos,`
`1061`	`1057`	`}`
`1062`	`1058`	`}`
`1063`	`1059`	`release_metapath(&mp);`
`1064`		`- if (gfs2_is_jdata(ip))`
	`1060`	`+ if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip))`
`1065`	`1061`	`iomap->page_done = gfs2_iomap_journaled_page_done;`
`1066`	`1062`	`return 0;`
`1067`	`1063`