Revert "b=19427 correct lmm_object_id and reserve fids for fid-on-OST."

[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 e16de41..2aed070 100644 (file)
--- a/lustre/include/linux/lustre_handles.h
+++ b/lustre/include/linux/lustre_handles.h
@@ -16,8 +16,8 @@
  * 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 [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -52,8 +52,9 @@
 
 # ifdef HAVE_RCU
 #  include <linux/rcupdate.h> /* for rcu_head{} */
+typedef struct rcu_head cfs_rcu_head_t;
 # else
-struct rcu_head { };
+typedef struct cfs_rcu_head { } cfs_rcu_head_t;
 # endif
 
 #endif /* ifdef __KERNEL__ */