client: add callback for cache invalidate

This will get called any time an inode's cached file data is invalidated.
cfuse will use it.

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 8f94a214c9c74d07a8164acd43c1baab9c947faa..7e5ff5985cca318c579f5663f6816ce4e17536e7 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -148,7 +148,9 @@ dir_result_t::dir_result_t(Inode *in)
 // cons/des
 
 Client::Client(Messenger *m, MonClient *mc)
-  : Dispatcher(m->cct), cct(m->cct), timer(m->cct, client_lock), client_lock("Client::client_lock"),
+  : Dispatcher(m->cct), cct(m->cct), timer(m->cct, client_lock), 
+    ino_invalidate_cb(NULL),
+    client_lock("Client::client_lock"),
   filer_flags(0)
 {
   // which client am i?
@@ -2091,7 +2093,8 @@ void Client::check_caps(Inode *in, bool is_delayed)
           << " is_delayed=" << is_delayed
           << dendl;
 
-  if (in->snapid != CEPH_NOSNAP) return; //snap caps last forever, can't write
+  if (in->snapid != CEPH_NOSNAP)
+    return; //snap caps last forever, can't write
   
   if (in->caps.empty())
     return;   // guard if at end of func
@@ -2336,6 +2339,9 @@ void Client::_invalidate_inode_cache(Inode *in)
 
   if (cct->_conf->client_oc)
     objectcacher->release_set(&in->oset);
+  
+  if (ino_invalidate_cb)
+    ino_invalidate_cb(ino_invalidate_cb_handle, in->vino(), 0, 0);
 }
 
 void Client::_invalidate_inode_cache(Inode *in, int64_t off, int64_t len)
@@ -2347,6 +2353,9 @@ void Client::_invalidate_inode_cache(Inode *in, int64_t off, int64_t len)
     filer->file_to_extents(in->ino, &in->layout, off, len, ls);
     objectcacher->truncate_set(&in->oset, ls);
   }
+  
+  if (ino_invalidate_cb)
+    ino_invalidate_cb(ino_invalidate_cb_handle, in->vino(), off, len);
 }
 
 
@@ -5585,6 +5594,12 @@ int Client::ll_statfs(vinodeno_t vino, struct statvfs *stbuf)
   return statfs(0, stbuf);
 }
 
+void Client::ll_register_ino_invalidate_cb(client_ino_callback_t cb, void *handle)
+{
+  Mutex::Locker l(client_lock);
+  ino_invalidate_cb = cb;
+  ino_invalidate_cb_handle = handle;
+}
 
 int Client::_sync_fs()
 {

diff --git a/src/client/Client.h b/src/client/Client.h
index abe70cbb9320496f2982659fde65abb136fd4300..bd7479617ffdfa9316d323c6aa468bdae4d9ab09 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -114,6 +114,7 @@ class MetaSession;
 class MetaRequest;
 
 
+typedef void (*client_ino_callback_t)(void *handle, vinodeno_t ino, int64_t off, int64_t len);
 
 
 // ========================================================
@@ -189,6 +190,9 @@ class Client : public Dispatcher {
 
   SafeTimer timer;
 
+  client_ino_callback_t ino_invalidate_cb;
+  void *ino_invalidate_cb_handle;
+
   Context *tick_event;
   utime_t last_cap_renew;
   void renew_caps();
@@ -636,6 +640,8 @@ public:
   int ll_fsync(Fh *fh, bool syncdataonly);
   int ll_release(Fh *fh);
   int ll_statfs(vinodeno_t vino, struct statvfs *stbuf);
+
+  void ll_register_ino_invalidate_cb(client_ino_callback_t cb, void *handle);
 };
 
 #endif