Commit 8504a9e5 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

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: default avatarJohn L. Hammond <john.hammond@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1805124

drivers/staging/lustre/lustre/include/linux/lustre_handles.h

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/*

 * 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 <lustre_handles.h> instead

#endif



#include <asm/types.h>

#include <asm/atomic.h>

#include <linux/list.h>

#include <linux/spinlock.h>

#include <linux/types.h>



#include <linux/rcupdate.h> /* for rcu_head{} */

typedef struct rcu_head cfs_rcu_head_t;





#endif

drivers/staging/lustre/lustre/include/lustre_handles.h

+7 −3
Original line number Diff line number Diff line
@@ -42,7 +42,11 @@ 
 * @{

 */



#include "linux/lustre_handles.h"

#include <linux/atomic.h>

#include <linux/list.h>

#include <linux/rcupdate.h>

#include <linux/spinlock.h>

#include <linux/types.h>



#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);

drivers/staging/lustre/lustre/obdclass/lustre_handles.c

+1 −1
Original line number Diff line number Diff line
@@ -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;