From: Sage Weil <sage@newdream.net>
Date: Thu, 10 Jun 2010 22:50:10 +0000 (-0700)
Subject: ceph: only set num_pages in calc_layout
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=796d6955a51ce6768d0e033f27a2f8f5be6cb39a;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

ceph: only set num_pages in calc_layout

Setting it elsewhere is unnecessary and more fragile.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index e3852234789..707d2dbd877 100644
--- a/fs/ceph/osd_client.c
+++ b/fs/ceph/osd_client.c
@@ -1276,8 +1276,6 @@ int ceph_osdc_readpages(struct ceph_osd_client *osdc,
 
 	/* it may be a short read due to an object boundary */
 	req->r_pages = pages;
-	num_pages = calc_pages_for(off, *plen);
-	req->r_num_pages = num_pages;
 
 	dout("readpages  final extent is %llu~%llu (%d pages)\n",
 	     off, *plen, req->r_num_pages);
@@ -1319,7 +1317,6 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino,
 
 	/* it may be a short write due to an object boundary */
 	req->r_pages = pages;
-	req->r_num_pages = calc_pages_for(off, len);
 	dout("writepages %llu~%llu (%d pages)\n", off, len,
 	     req->r_num_pages);