From: Sage Weil <sage@newdream.net>
Date: Tue, 1 Apr 2008 18:25:56 +0000 (-0700)
Subject: kclient: disable readpages, for now
X-Git-Tag: v0.2~233
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b280a2bbcbec08b55ef992b1908ed9be0611843;p=ceph.git

kclient: disable readpages, for now
---

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index 84ccb08cab5a..3e4bc1231bd6 100644
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -502,12 +502,12 @@ static int ceph_releasepage(struct page *page, gfp_t gfpmask)
 
 
 const struct address_space_operations ceph_aops = {
-	.readpage = ceph_readpage,
-	.readpages = ceph_readpages,
 	.write_begin = ceph_write_begin,
 	.write_end = ceph_write_end,
 	//.prepare_write = ceph_prepare_write,
 	//.commit_write = ceph_commit_write,
+	.readpage = ceph_readpage,
+	//.readpages = ceph_readpages,
 	.writepage = ceph_writepage,
 	.writepages = ceph_writepages,
 //	.set_page_dirty = ceph_set_page_dirty,
diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index db130bc39dba..56d7a41bd524 100644
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -1530,8 +1530,12 @@ void schedule_delayed(struct ceph_mds_client *mdsc)
 	/*
 	 * renew at 1/2 the advertised timeout period.
 	 */
-	unsigned hz = (HZ * mdsc->mdsmap->m_cap_bit_timeout) >> 1;
-	schedule_delayed_work(&mdsc->delayed_work, hz);
+	int delay = mdsc->mdsmap->m_cap_bit_timeout >> 1;
+	unsigned hz = HZ * delay;
+	int r;
+	dout(10, "schedule_delayed for %d seconds (%u hz)\n", delay, hz);
+	r = schedule_delayed_work(&mdsc->delayed_work, hz);
+	dout(10, "r = %d\n", r);
 }
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)