From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Wed, 25 Sep 2019 19:26:14 +0000 (-0400)
Subject: bcachefs: Trivial cleanup
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d55460bb099592ccec816afb5e662896ec5fffaa;p=linux.git

bcachefs: Trivial cleanup

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index e3f1d1dd06aed..42c5719155e67 100644
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -830,11 +830,7 @@ vm_fault_t bch2_page_mkwrite(struct vm_fault *vmf)
 		goto out;
 	}
 
-	/* page is wholly or partially inside EOF */
-	if (((page->index + 1) << PAGE_SHIFT) <= isize)
-		len = PAGE_SIZE;
-	else
-		len = offset_in_page(isize);
+	len = min_t(loff_t, PAGE_SIZE, isize - page_offset(page));
 
 	if (bch2_page_reservation_get(c, inode, page, &res, 0, len, true)) {
 		unlock_page(page);