From: Christoph Hellwig <hch@lst.de>
Date: Mon, 1 Jul 2019 21:54:31 +0000 (+0200)
Subject: gfs2: use page_offset in gfs2_page_mkwrite
X-Git-Tag: v5.3-rc1~146^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3915f83e84c1f14358aaa91e8785d6169092176;p=thirdparty%2Fkernel%2Flinux.git

gfs2: use page_offset in gfs2_page_mkwrite

Without casting page->index to a guaranteed 64-bit type, the value might be
treated as 32-bit on 32-bit platforms and thus get truncated.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 28bdbeb110301..5d61113b3f50e 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -408,7 +408,7 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf)
 	struct gfs2_sbd *sdp = GFS2_SB(inode);
 	struct gfs2_alloc_parms ap = { .aflags = 0, };
 	unsigned long last_index;
-	u64 pos = page->index << PAGE_SHIFT;
+	u64 pos = page_offset(page);
 	unsigned int data_blocks, ind_blocks, rblocks;
 	struct gfs2_holder gh;
 	loff_t size;