diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2018-10-09 13:20:05 +0200 |
---|---|---|
committer | Andreas Gruenbacher <agruenba@redhat.com> | 2018-10-09 18:20:13 +0200 |
commit | dc480feb454a975b7ee2c18a2f98fb34e04d3baf (patch) | |
tree | 38537f9b8412bfb8cbb96686a8ce014e2679491b /fs/gfs2 | |
parent | 0854ba5ff5c938307cd783e996b62c83f1ce923b (diff) | |
download | op-kernel-dev-dc480feb454a975b7ee2c18a2f98fb34e04d3baf.zip op-kernel-dev-dc480feb454a975b7ee2c18a2f98fb34e04d3baf.tar.gz |
gfs2: Fix iomap buffered write support for journaled files
Commit 64bc06bb32ee 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>
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/bmap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 03128ed..3c159a7 100644 --- 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); } |