diff mbox

[13/14] libceph: nuke ceph_osdc_unregister_linger_request()

Message ID 1403716607-13535-14-git-send-email-ilya.dryomov@inktank.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ilya Dryomov June 25, 2014, 5:16 p.m. UTC
Remove now unused ceph_osdc_unregister_linger_request().

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
---
 include/linux/ceph/osd_client.h |    2 --
 net/ceph/osd_client.c           |   12 ------------
 2 files changed, 14 deletions(-)

Comments

Alex Elder July 7, 2014, 10:36 p.m. UTC | #1
On 06/25/2014 12:16 PM, Ilya Dryomov wrote:
> Remove now unused ceph_osdc_unregister_linger_request().
> 
> Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>

Looks good.

Reviewed-by: Alex Elder <elder@linaro.org>

> ---
>  include/linux/ceph/osd_client.h |    2 --
>  net/ceph/osd_client.c           |   12 ------------
>  2 files changed, 14 deletions(-)
> 
> diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
> index de09cad7b7c7..03aeb27fcc69 100644
> --- a/include/linux/ceph/osd_client.h
> +++ b/include/linux/ceph/osd_client.h
> @@ -325,8 +325,6 @@ extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,
>  
>  extern void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc,
>  					 struct ceph_osd_request *req);
> -extern void ceph_osdc_unregister_linger_request(struct ceph_osd_client *osdc,
> -						struct ceph_osd_request *req);
>  
>  extern void ceph_osdc_get_request(struct ceph_osd_request *req);
>  extern void ceph_osdc_put_request(struct ceph_osd_request *req);
> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
> index ef44cc0bbc6a..30f6faf3584f 100644
> --- a/net/ceph/osd_client.c
> +++ b/net/ceph/osd_client.c
> @@ -1281,18 +1281,6 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
>  	ceph_osdc_put_request(req);
>  }
>  
> -void ceph_osdc_unregister_linger_request(struct ceph_osd_client *osdc,
> -					 struct ceph_osd_request *req)
> -{
> -	mutex_lock(&osdc->request_mutex);
> -	if (req->r_linger) {
> -		req->r_linger = 0;
> -		__unregister_linger_request(osdc, req);
> -	}
> -	mutex_unlock(&osdc->request_mutex);
> -}
> -EXPORT_SYMBOL(ceph_osdc_unregister_linger_request);
> -
>  void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc,
>  				  struct ceph_osd_request *req)
>  {
> 

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index de09cad7b7c7..03aeb27fcc69 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -325,8 +325,6 @@  extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,
 
 extern void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc,
 					 struct ceph_osd_request *req);
-extern void ceph_osdc_unregister_linger_request(struct ceph_osd_client *osdc,
-						struct ceph_osd_request *req);
 
 extern void ceph_osdc_get_request(struct ceph_osd_request *req);
 extern void ceph_osdc_put_request(struct ceph_osd_request *req);
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index ef44cc0bbc6a..30f6faf3584f 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1281,18 +1281,6 @@  static void __unregister_linger_request(struct ceph_osd_client *osdc,
 	ceph_osdc_put_request(req);
 }
 
-void ceph_osdc_unregister_linger_request(struct ceph_osd_client *osdc,
-					 struct ceph_osd_request *req)
-{
-	mutex_lock(&osdc->request_mutex);
-	if (req->r_linger) {
-		req->r_linger = 0;
-		__unregister_linger_request(osdc, req);
-	}
-	mutex_unlock(&osdc->request_mutex);
-}
-EXPORT_SYMBOL(ceph_osdc_unregister_linger_request);
-
 void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc,
 				  struct ceph_osd_request *req)
 {