summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-13 09:06:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-13 09:06:27 +0200
commited66c252d9169698b1052d5e3dc7b7764adb20b9 (patch)
tree016fa95c43e23867a20c193c542e661fcd151256 /fs
parente66d001c454b9ac8d7b809e84f457b98def209a1 (diff)
parentfee5150c484c75c473dc1e2d07cb6151384ef85f (diff)
downloadlinux-ed66c252d9169698b1052d5e3dc7b7764adb20b9.tar.bz2
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)
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/bmap.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 3c159a7f9a9e..84544a4f012d 100644
--- 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;