[Ocfs2-commits] zab commits r1836 - in trunk/fs/ocfs2: . cluster dlm
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Jan 24 14:07:08 CST 2005
Author: zab
Date: 2005-01-24 14:07:07 -0600 (Mon, 24 Jan 2005)
New Revision: 1836
Removed:
trunk/fs/ocfs2/cluster/warning_hack.h
trunk/fs/ocfs2/dlm/warning_hack.h
Modified:
trunk/fs/ocfs2/cluster/cl_compat.h
trunk/fs/ocfs2/cluster/compat_libfs.c
trunk/fs/ocfs2/cluster/heartbeat.c
trunk/fs/ocfs2/cluster/nodemanager.c
trunk/fs/ocfs2/cluster/tcp.c
trunk/fs/ocfs2/cluster/util.c
trunk/fs/ocfs2/dlm/dlmast.c
trunk/fs/ocfs2/dlm/dlmconvert.c
trunk/fs/ocfs2/dlm/dlmlock.c
trunk/fs/ocfs2/dlm/dlmmaster.c
trunk/fs/ocfs2/dlm/dlmmod.c
trunk/fs/ocfs2/dlm/dlmrecovery.c
trunk/fs/ocfs2/dlm/dlmthread.c
trunk/fs/ocfs2/dlm/dlmunlock.c
trunk/fs/ocfs2/dlm/util.c
trunk/fs/ocfs2/ocfs_compat.h
Log:
o remove declarations that try and mirror the kernel's interfaces to quiet the
illconceived use of certain gcc warning options. They eventually fell behind
and were then different than the interfaces in newer kernels.
Modified: trunk/fs/ocfs2/cluster/cl_compat.h
===================================================================
--- trunk/fs/ocfs2/cluster/cl_compat.h 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/cluster/cl_compat.h 2005-01-24 20:07:07 UTC (rev 1836)
@@ -49,11 +49,6 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-extern inline int generic_fls(int x);
-extern inline int get_bitmask_order(unsigned int count);
-/* XXX Hack to avoid warning */
-struct mem_dqinfo;
-
#define flush_scheduled_work flush_scheduled_tasks
#define work_struct tq_struct
#define INIT_WORK(w, f, d) INIT_TQUEUE(w, f, d)
Modified: trunk/fs/ocfs2/cluster/compat_libfs.c
===================================================================
--- trunk/fs/ocfs2/cluster/compat_libfs.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/cluster/compat_libfs.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -6,7 +6,6 @@
* 2.4 compat Library for filesystems writers.
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/pagemap.h>
Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/cluster/heartbeat.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -26,7 +26,6 @@
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/kernel.h>
Modified: trunk/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/cluster/nodemanager.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include "cl_compat.h"
#include "util.h"
Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/cluster/tcp.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -73,7 +73,6 @@
* - move to userspace connection management?
*
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/cluster/util.c
===================================================================
--- trunk/fs/ocfs2/cluster/util.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/cluster/util.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include "cl_compat.h"
Deleted: trunk/fs/ocfs2/cluster/warning_hack.h
===================================================================
--- trunk/fs/ocfs2/cluster/warning_hack.h 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/cluster/warning_hack.h 2005-01-24 20:07:07 UTC (rev 1836)
@@ -1,39 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * warning_hack.h
- *
- * just to get rid of stupid warnings
- *
- * Copyright (C) 2004 Oracle. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Kurt Hackel
- */
-
-#ifndef WARNING_HACK_H
-#define WARNING_HACK_H
-
-struct mem_dqinfo;
-struct request;
-
-extern __inline__ int generic_fls(int x);
-extern __inline__ int get_bitmask_order(unsigned int count);
-extern inline int rq_data_dir(struct request *rq);
-
-
-#endif /* WARNING_HACK_H */
Modified: trunk/fs/ocfs2/dlm/dlmast.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmast.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/dlmast.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/dlm/dlmconvert.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmconvert.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/dlmconvert.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/dlm/dlmlock.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmlock.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/dlmlock.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/dlm/dlmmod.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmod.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/dlmmod.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmrecovery.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/dlmrecovery.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/dlm/dlmthread.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmthread.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/dlmthread.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/dlm/dlmunlock.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmunlock.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/dlmunlock.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/module.h>
#include <linux/fs.h>
Modified: trunk/fs/ocfs2/dlm/util.c
===================================================================
--- trunk/fs/ocfs2/dlm/util.c 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/util.c 2005-01-24 20:07:07 UTC (rev 1836)
@@ -25,7 +25,6 @@
* Authors: Kurt Hackel
*/
-#include "warning_hack.h"
#include <linux/version.h>
#include <linux/fs.h>
Deleted: trunk/fs/ocfs2/dlm/warning_hack.h
===================================================================
--- trunk/fs/ocfs2/dlm/warning_hack.h 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/dlm/warning_hack.h 2005-01-24 20:07:07 UTC (rev 1836)
@@ -1,39 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * warning_hack.h
- *
- * just to get rid of stupid warnings
- *
- * Copyright (C) 2004 Oracle. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Kurt Hackel
- */
-
-#ifndef WARNING_HACK_H
-#define WARNING_HACK_H
-
-struct mem_dqinfo;
-struct request;
-
-extern __inline__ int generic_fls(int x);
-extern __inline__ int get_bitmask_order(unsigned int count);
-extern inline int rq_data_dir(struct request *rq);
-
-
-#endif /* WARNING_HACK_H */
Modified: trunk/fs/ocfs2/ocfs_compat.h
===================================================================
--- trunk/fs/ocfs2/ocfs_compat.h 2005-01-24 18:38:43 UTC (rev 1835)
+++ trunk/fs/ocfs2/ocfs_compat.h 2005-01-24 20:07:07 UTC (rev 1836)
@@ -32,19 +32,6 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#ifdef __ia64__
-extern inline void prefetch(const void *x);
-extern inline void prefetchw(const void *x);
-#else
-static inline void prefetch(const void *x);
-static inline void prefetchw(const void *x);
-#endif
-extern inline int generic_fls(int x);
-extern inline int get_bitmask_order(unsigned int count);
-/* XXX Hack to avoid warning */
-struct mem_dqinfo;
-extern inline void mark_info_dirty(struct mem_dqinfo *info);
-
#include <linux/sched.h>
#define OCFS_GENERIC_SB_MEMBER(sb) ((sb)->u.generic_sbp)
More information about the Ocfs2-commits
mailing list