From 0785cf7236983c22a8b6366acad69cb16b755e87 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 7 Mar 2008 16:25:44 -0800
Subject: [PATCH] client: wait for caps on write too

---
 src/kernel/file.c  | 27 +++++++++++++++++++++++++--
 src/kernel/super.h | 11 ++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/kernel/file.c b/src/kernel/file.c
index b7ce19dfea02e..e3081e0486c96 100644
--- a/src/kernel/file.c
+++ b/src/kernel/file.c
@@ -241,6 +241,7 @@ ssize_t ceph_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
 	ssize_t ret;
 	int got = 0;
 
+	dout(10, "read trying to get caps\n");
 	ret = wait_event_interruptible(ci->i_cap_wq,
 				       ceph_get_cap_refs(ci, CEPH_CAP_RD, CEPH_CAP_RDCACHE, &got));
 	if (ret < 0) 
@@ -250,8 +251,31 @@ ssize_t ceph_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
 	//if (got & CEPH_CAP_RDCACHE) {
 	ret = do_sync_read(filp, buf, len, ppos);
 
+out:
 	dout(10, "read dropping cap refs on %d\n", got);
+	ceph_put_cap_refs(ci, got);
+	return ret;
+}
+
+ssize_t ceph_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
+{
+	struct inode *inode = filp->f_dentry->d_inode;
+	struct ceph_inode_info *ci = ceph_inode(inode);
+	ssize_t ret;
+	int got = 0;
+
+	dout(10, "write trying to get caps\n");
+	ret = wait_event_interruptible(ci->i_cap_wq,
+				       ceph_get_cap_refs(ci, CEPH_CAP_WR, CEPH_CAP_WRBUFFER, &got));
+	if (ret < 0) 
+		goto out;
+	dout(10, "write got cap refs on %d\n", got);
+
+	//if (got & CEPH_CAP_RDCACHE) {
+	ret = do_sync_write(filp, buf, len, ppos);
+
 out:
+	dout(10, "write dropping cap refs on %d\n", got);
 	ceph_put_cap_refs(ci, got);
 	return ret;
 }
@@ -319,8 +343,7 @@ const struct file_operations ceph_file_fops = {
 	.release = ceph_release,
 	.llseek = generic_file_llseek,
 	.read = ceph_read,
-	//.write = ceph_silly_write,
-	.write = do_sync_write,
+	.write = ceph_write,
 	.aio_read = generic_file_aio_read,
 	.aio_write = generic_file_aio_write,
 	.mmap = generic_file_mmap,
diff --git a/src/kernel/super.h b/src/kernel/super.h
index 1b7666eab72ef..bf269e0093b6f 100644
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -214,7 +214,16 @@ static inline int ceph_caps_wanted(struct ceph_inode_info *ci)
 
 static inline int ceph_caps_used(struct ceph_inode_info *ci)
 {
-	return 0;  /* FIXME */
+	int used = 0;
+	if (ci->i_rd_ref)
+		used |= CEPH_CAP_RD;
+	if (ci->i_rdcache_ref)
+		used |= CEPH_CAP_RDCACHE;
+	if (ci->i_wr_ref)
+		used |= CEPH_CAP_WR;
+	if (ci->i_wrbuffer_ref)
+		used |= CEPH_CAP_WRBUFFER;
+	return used;
 }
 
 static inline int ceph_file_mode(int flags)
-- 
2.39.5