From 3ddf936e885e6305da11f62da901e8d53cd0110e Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Wed, 30 Jan 2013 11:13:33 -0600
Subject: [PATCH] --- yaml --- r: 359647 b: refs/heads/master c:
 72fe25e3460c8673984370208e0e6261101372d6 h: refs/heads/master i:   359645:
 bb7c50848ba573edfd1fdeb4164328697fb76116   359643:
 170d34dabd415e0e9e67d95ceb7b355b21c8211b   359639:
 bcd64ab0a895706c4291ebb366eed76540323319   359631:
 1b8329fa52e967793ba727e34968652892fb74ca   359615:
 79f36e38c9232d8726151eb5f1653e73c1c80b2a v: v3

---
 [refs]                             |  2 +-
 trunk/include/linux/ceph/libceph.h |  2 ++
 trunk/net/ceph/ceph_common.c       | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 95967791abfc..e0779527e183 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b82d167be64b3e88d9434d8a98ce83c83a07aa48
+refs/heads/master: 72fe25e3460c8673984370208e0e6261101372d6
diff --git a/trunk/include/linux/ceph/libceph.h b/trunk/include/linux/ceph/libceph.h
index 084d3c622b12..c44275ab375c 100644
--- a/trunk/include/linux/ceph/libceph.h
+++ b/trunk/include/linux/ceph/libceph.h
@@ -193,6 +193,8 @@ static inline int calc_pages_for(u64 off, u64 len)
 }
 
 /* ceph_common.c */
+extern bool libceph_compatible(void *data);
+
 extern const char *ceph_msg_type_name(int type);
 extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid);
 extern struct kmem_cache *ceph_inode_cachep;
diff --git a/trunk/net/ceph/ceph_common.c b/trunk/net/ceph/ceph_common.c
index ee71ea26777a..a98c03ff853f 100644
--- a/trunk/net/ceph/ceph_common.c
+++ b/trunk/net/ceph/ceph_common.c
@@ -26,6 +26,22 @@
 #include "crypto.h"
 
 
+/*
+ * Module compatibility interface.  For now it doesn't do anything,
+ * but its existence signals a certain level of functionality.
+ *
+ * The data buffer is used to pass information both to and from
+ * libceph.  The return value indicates whether libceph determines
+ * it is compatible with the caller (from another kernel module),
+ * given the provided data.
+ *
+ * The data pointer can be null.
+ */
+bool libceph_compatible(void *data)
+{
+	return false;
+}
+EXPORT_SYMBOL(libceph_compatible);
 
 /*
  * find filename portion of a path (/foo/bar/baz -> baz)