From ca070e3432a08a19642def709c7d107894a90e33 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 31 Mar 2009 12:41:59 -0700
Subject: [PATCH] kclient: make ->write_inode() flush dirty caps

---
 src/kernel/caps.c  | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/kernel/super.c |  7 -------
 src/kernel/super.h |  1 +
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/kernel/caps.c b/src/kernel/caps.c
index 3d659f6964de7..584b0a1181ba6 100644
--- a/src/kernel/caps.c
+++ b/src/kernel/caps.c
@@ -1005,6 +1005,49 @@ ack:
 		up_read(&mdsc->snap_rwsem);
 }
 
+/*
+ * Flush any dirty caps back to the mds
+ */
+int ceph_write_inode(struct inode *inode, int unused)
+{
+	struct ceph_mds_client *mdsc = &ceph_client(inode->i_sb)->mdsc;
+	struct ceph_inode_info *ci = ceph_inode(inode);
+	struct rb_node *p;
+	struct ceph_cap *cap;
+	int dirty;
+	int mds = -1;
+
+	dout(10, "write_inode %p\n", inode);
+more:
+	spin_lock(&inode->i_lock);
+	dirty = __ceph_caps_dirty(ci);
+	if (dirty) {
+		int used = __ceph_caps_used(ci);
+		int want = __ceph_caps_mds_wanted(ci);
+
+		for (p = rb_first(&ci->i_caps); p; p = rb_next(p)) {
+			cap = rb_entry(p, struct ceph_cap, ci_node);
+			if (mds >= cap->mds)
+				continue;
+			mds = cap->mds;
+
+			cap->flushing |= dirty & cap->implemented;
+			if (cap->flushing) {
+				ci->i_dirty_caps &= ~cap->flushing;
+				dout(10, " flushing %s, dirty_caps now %s\n",
+				     ceph_cap_string(cap->flushing),
+				     ceph_cap_string(ci->i_dirty_caps));
+			}
+			__send_cap(mdsc, cap, CEPH_CAP_OP_UPDATE, used, want,
+				   cap->issued | cap->implemented);
+			goto more;
+		}
+	}
+	spin_unlock(&inode->i_lock);
+	return 0;
+}
+
+
 /*
  * Take references to capabilities we hold, so that we don't release
  * them to the MDS prematurely.
diff --git a/src/kernel/super.c b/src/kernel/super.c
index 8202edf8df9fe..2eae58e55ff86 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -43,13 +43,6 @@ void ceph_peer_reset(void *p, struct ceph_entity_addr *peer_addr,
 /*
  * super ops
  */
-static int ceph_write_inode(struct inode *inode, int unused)
-{
-	struct ceph_inode_info *ci = ceph_inode(inode);
-
-	return 0;
-}
-
 static void ceph_put_super(struct super_block *s)
 {
 	struct ceph_client *cl = ceph_client(s);
diff --git a/src/kernel/super.h b/src/kernel/super.h
index fb8d7611cbcac..e0085de79266b 100644
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -745,6 +745,7 @@ extern int ceph_add_cap(struct inode *inode,
 			struct ceph_cap *new_cap);
 extern void ceph_remove_cap(struct ceph_cap *cap);
 extern void ceph_queue_caps_release(struct inode *inode);
+extern int ceph_write_inode(struct inode *inode, int unused);
 extern int ceph_get_cap_mds(struct inode *inode);
 extern void ceph_get_cap_refs(struct ceph_inode_info *ci, int caps);
 extern void ceph_put_cap_refs(struct ceph_inode_info *ci, int had);
-- 
2.39.5