staging: lustre: remove RCU2HANDLE macro

Remove RCU2HANDLE macro from lustre_handles.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/11498
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre_handles.h b/drivers/staging/lustre/lustre/include/lustre_handles.h
index bc1dd46601510747780516ad568a0c1c905a766a..e071bac9df5769e4b4c94b9ae99d4e2bb1a039b1 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_handles.h
+++ b/drivers/staging/lustre/lustre/include/lustre_handles.h
@@ -76,8 +76,6 @@ struct portals_handle {
        unsigned int                    h_in:1;
 };
 
-#define RCU2HANDLE(rcu)    container_of(rcu, struct portals_handle, h_rcu)
-
 /* handles.c */
 
 /* Add a handle to the hash table */

diff --git a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
index 8faa318bf6b4e7a3c7a6d8b35e6f5323f07f3dc8..c9445e5ec27160361cefe5962fa44145c96831f5 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
+++ b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
@@ -164,8 +164,11 @@ EXPORT_SYMBOL(class_handle2object);
 
 void class_handle_free_cb(struct rcu_head *rcu)
 {
-       struct portals_handle *h = RCU2HANDLE(rcu);
-       void *ptr = (void *)(unsigned long)h->h_cookie;
+       struct portals_handle *h;
+       void *ptr;
+
+       h = container_of(rcu, struct portals_handle, h_rcu);
+       ptr = (void *)(unsigned long)h->h_cookie;
 
        if (h->h_ops->hop_free)
                h->h_ops->hop_free(ptr, h->h_size);