From 8504a9e54437949003bb7aabfaa79c9c26bbf00e Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Thu, 28 Aug 2014 18:35:12 -0500 Subject: [PATCH] staging/lustre: remove linux/lustre_handles.h Remove lustre/include/linux/lustre_acl.h and kill the cfs_rcu_head_t typedef. Signed-off-by: John L. Hammond Signed-off-by: Greg Kroah-Hartman --- .../lustre/include/linux/lustre_handles.h | 52 ------------------- .../lustre/lustre/include/lustre_handles.h | 10 ++-- .../lustre/lustre/obdclass/lustre_handles.c | 2 +- 3 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_handles.h diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_handles.h b/drivers/staging/lustre/lustre/include/linux/lustre_handles.h deleted file mode 100644 index 459b2380600f..000000000000 --- a/drivers/staging/lustre/lustre/include/linux/lustre_handles.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * GPL HEADER END - */ -/* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef __LINUX_LUSTRE_HANDLES_H_ -#define __LINUX_LUSTRE_HANDLES_H_ - -#ifndef __LUSTRE_HANDLES_H_ -#error Do not #include this file directly. #include instead -#endif - -#include -#include -#include -#include -#include - -#include /* for rcu_head{} */ -typedef struct rcu_head cfs_rcu_head_t; - - -#endif diff --git a/drivers/staging/lustre/lustre/include/lustre_handles.h b/drivers/staging/lustre/lustre/include/lustre_handles.h index 94989c5e361f..726bbd3eaf55 100644 --- a/drivers/staging/lustre/lustre/include/lustre_handles.h +++ b/drivers/staging/lustre/lustre/include/lustre_handles.h @@ -42,7 +42,11 @@ * @{ */ -#include "linux/lustre_handles.h" +#include +#include +#include +#include +#include #include "../../include/linux/libcfs/libcfs.h" @@ -69,7 +73,7 @@ struct portals_handle { struct portals_handle_ops *h_ops; /* newly added fields to handle the RCU issue. -jxiong */ - cfs_rcu_head_t h_rcu; + struct rcu_head h_rcu; spinlock_t h_lock; unsigned int h_size:31; unsigned int h_in:1; @@ -84,7 +88,7 @@ void class_handle_hash(struct portals_handle *, void class_handle_unhash(struct portals_handle *); void class_handle_hash_back(struct portals_handle *); void *class_handle2object(__u64 cookie); -void class_handle_free_cb(cfs_rcu_head_t *); +void class_handle_free_cb(struct rcu_head *rcu); int class_handle_init(void); void class_handle_cleanup(void); diff --git a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c index 2010463429b1..f720e3183295 100644 --- a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c +++ b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c @@ -178,7 +178,7 @@ void *class_handle2object(__u64 cookie) } EXPORT_SYMBOL(class_handle2object); -void class_handle_free_cb(cfs_rcu_head_t *rcu) +void class_handle_free_cb(struct rcu_head *rcu) { struct portals_handle *h = RCU2HANDLE(rcu); void *ptr = (void *)(unsigned long)h->h_cookie; -- 2.39.2