3.4-stable patches

added patches:
	libceph-drop-declaration-of-ceph_con_get.patch

diff --git a/queue-3.4/libceph-drop-declaration-of-ceph_con_get.patch b/queue-3.4/libceph-drop-declaration-of-ceph_con_get.patch
new file mode 100644 (file)
index 0000000..276c304
--- /dev/null
+++ b/queue-3.4/libceph-drop-declaration-of-ceph_con_get.patch
@@ -0,0 +1,34 @@
+From 261030215d970c62f799e6e508e3c68fc7ec2aa9 Mon Sep 17 00:00:00 2001
+From: Alex Elder <elder@inktank.com>
+Date: Thu, 21 Jun 2012 12:49:23 -0700
+Subject: libceph: drop declaration of ceph_con_get()
+
+From: Alex Elder <elder@inktank.com>
+
+commit 261030215d970c62f799e6e508e3c68fc7ec2aa9 upstream.
+
+For some reason the declaration of ceph_con_get() and
+ceph_con_put() did not get deleted in this commit:
+    d59315ca libceph: drop ceph_con_get/put helpers and nref member
+
+Clean that up.
+
+Signed-off-by: Alex Elder <elder@inktank.com>
+Cc: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/ceph/messenger.h |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/include/linux/ceph/messenger.h
++++ b/include/linux/ceph/messenger.h
+@@ -215,8 +215,6 @@ extern void ceph_msg_revoke(struct ceph_
+ extern void ceph_msg_revoke_incoming(struct ceph_msg *msg);
+ 
+ extern void ceph_con_keepalive(struct ceph_connection *con);
+-extern struct ceph_connection *ceph_con_get(struct ceph_connection *con);
+-extern void ceph_con_put(struct ceph_connection *con);
+ 
+ extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,
+                                    bool can_fail);

diff --git a/queue-3.4/series b/queue-3.4/series
index 39d5db3592fbbd9e87dfb1563388939e90c0f493..7c5294391ce501e0364a94df4090c405b120af11 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -168,3 +168,4 @@ selinux-fix-sel_netnode_insert-suspicious-rcu-dereference.patch
 0114-ceph-avoid-32-bit-page-index-overflow.patch
 acpi-video-ignore-errors-after-_dod-evaluation.patch
 revert-serial-omap-fix-software-flow-control.patch
+libceph-drop-declaration-of-ceph_con_get.patch