summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-11 05:29:45 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-11 05:29:45 +0200
commita47f5c56b2eb55290e2a8668e9ca9c029990dbf6 (patch)
tree14dbfd50de0ed36f1649a1b0a192865b09db343d /fs/gfs2
parentMerge tag 'for_v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff)
parentiomap: fix page_done callback for short writes (diff)
downloadlinux-a47f5c56b2eb55290e2a8668e9ca9c029990dbf6.tar.xz
linux-a47f5c56b2eb55290e2a8668e9ca9c029990dbf6.zip
Merge tag 'iomap-5.3-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull iomap updates from Darrick Wong: "There are a few fixes for gfs2 but otherwise it's pretty quiet so far. - Only mark inode dirty at the end of writing to a file (instead of once for every page written). - Fix for an accounting error in the page_done callback" * tag 'iomap-5.3-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: iomap: fix page_done callback for short writes fs: fold __generic_write_end back into generic_write_end iomap: don't mark the inode dirty in iomap_write_end
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/bmap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 93ea1d529aa3..f4b895fc632d 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1182,6 +1182,8 @@ static int gfs2_iomap_end(struct inode *inode, loff_t pos, loff_t length,
if (ip->i_qadata && ip->i_qadata->qa_qd_num)
gfs2_quota_unlock(ip);
+ if (iomap->flags & IOMAP_F_SIZE_CHANGED)
+ mark_inode_dirty(inode);
gfs2_write_unlock(inode);
out: