Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed66c252 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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)
parents e66d001c fee5150c

fs/gfs2/bmap.c

+1 −5
Original line number Diff line number Diff line
@@ -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;