From: Greg Kroah-Hartman Date: Mon, 26 Nov 2012 19:00:55 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.0.53~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=059b4a6ecc6f49830b0362c1da1a6c31fa0f3355;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..276c3044db1 --- /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 +Date: Thu, 21 Jun 2012 12:49:23 -0700 +Subject: libceph: drop declaration of ceph_con_get() + +From: Alex Elder + +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 +Cc: Herton Ronaldo Krzesinski +Signed-off-by: Greg Kroah-Hartman + +--- + 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 39d5db3592f..7c5294391ce 100644 --- 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