LU-709 build: clean up quota_read, follow_link and RCU

[fs/lustre-release.git] / lustre / include / linux / lustre_handles.h

diff --git a/lustre/include/linux/lustre_handles.h b/lustre/include/linux/lustre_handles.h
index afbe6e5..365010b 100644 (file)
--- a/lustre/include/linux/lustre_handles.h
+++ b/lustre/include/linux/lustre_handles.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*

  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.


@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*


@@ -45,16 +43,12 @@
 #include <asm/types.h>
 #include <asm/atomic.h>
 #include <linux/list.h>
 #include <asm/types.h>
 #include <asm/atomic.h>
 #include <linux/list.h>

-#include <linux/random.h>

 #include <linux/version.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 
 #include <linux/version.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 

-# ifdef HAVE_RCU
-#  include <linux/rcupdate.h> /* for rcu_head{} */
-# else
-struct rcu_head { };
-# endif
+#include <linux/rcupdate.h> /* for rcu_head{} */
+typedef struct rcu_head cfs_rcu_head_t;

 
 #endif /* ifdef __KERNEL__ */
 
 
 #endif /* ifdef __KERNEL__ */