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

Commit ce43565a authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Greg Kroah-Hartman
Browse files

gfs2: jdata writepage fix 



[ Upstream commit cbb60951ce18c9b6e91d2eb97deb41d8ff616622 ]

The ->writepage() and ->writepages() operations are supposed to write
entire pages.  However, on filesystems with a block size smaller than
PAGE_SIZE, __gfs2_jdata_writepage() only adds the first block to the
current transaction instead of adding the entire page.  Fix that.

Fixes: 18ec7d5c ("[GFS2] Make journaled data files identical to normal files on disk")
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3524d6da

fs/gfs2/aops.c

+1 −2
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w 
{

	struct inode *inode = page->mapping->host;

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);



	if (PageChecked(page)) {

		ClearPageChecked(page);
@@ -164,7 +163,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w 
			create_empty_buffers(page, inode->i_sb->s_blocksize,

					     BIT(BH_Dirty)|BIT(BH_Uptodate));

		}

		gfs2_page_add_databufs(ip, page, 0, sdp->sd_vfs->s_blocksize);

		gfs2_page_add_databufs(ip, page, 0, PAGE_SIZE);

	}

	return gfs2_write_full_page(page, gfs2_get_block_noalloc, wbc);

}