Merge tag 'media/v4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mirror_ubuntu-bionic-kernel.git] / fs / gfs2 / aops.c

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 5a6f52ea272282b0c695372f11c8f8512c7ace12..6b039d7ce160fce7677c3e5d702cd27a6299bb59 100644 (file)
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -839,12 +839,10 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh,
        BUG_ON((pos + len) > (dibh->b_size - sizeof(struct gfs2_dinode)));
        kaddr = kmap_atomic(page);
        memcpy(buf + pos, kaddr + pos, copied);
-       memset(kaddr + pos + copied, 0, len - copied);
        flush_dcache_page(page);
        kunmap_atomic(kaddr);
 
-       if (!PageUptodate(page))
-               SetPageUptodate(page);
+       WARN_ON(!PageUptodate(page));
        unlock_page(page);
        put_page(page);