From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:24:23 +0000 (-0700)
Subject: Remove compat_file.h
X-Git-Tag: 2010.07.25-280253~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67d4c71ddecbf0b0c0c3a697149dc26986bbe42f;p=thirdparty%2Fopen-vm-tools.git

Remove compat_file.h

Again this is not needed on 2.6.9+ kernels.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/shared/compat_file.h b/open-vm-tools/modules/linux/shared/compat_file.h
deleted file mode 100644
index 5af3010c9..000000000
--- a/open-vm-tools/modules/linux/shared/compat_file.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*********************************************************
- * Copyright (C) 2002 VMware, Inc. 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 version 2 and no 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.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- *********************************************************/
-
-#ifndef __COMPAT_FILE_H__
-#   define __COMPAT_FILE_H__
-
-
-/* The fput() API is modified in 2.2.0 --hpreg */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 2, 0)
-#   define compat_fput(_file) fput(_file)
-#else
-#   define compat_fput(_file) fput(_file, (_file)->f_inode)
-#endif
-
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
-#   define compat_get_file(_file) get_file(_file)
-#   define compat_file_count(_file) file_count(_file)
-#else
-#   define compat_get_file(_file) (_file)->f_count++
-#   define compat_file_count(_file) (_file)->f_count
-#endif
-
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 2, 4)
-#   define compat_filp_close(_file, _files) filp_close(_file, _files)
-#else
-static inline void compat_filp_close(struct file* filp, fl_owner_t files) {
-   if (filp->f_op && filp->f_op->flush) {
-      filp->f_op->flush(filp);
-   }
-   /*
-    * Hopefully there are no locks to release on this filp. 
-    * locks_remove_posix is not exported so we cannot use it...
-    */
-   fput(filp);
-}
-#endif
-
-
-#endif /* __COMPAT_FILE_H__ */
diff --git a/open-vm-tools/modules/linux/shared/compat_wait.h b/open-vm-tools/modules/linux/shared/compat_wait.h
index 407b0ea3d..08ae86cda 100644
--- a/open-vm-tools/modules/linux/shared/compat_wait.h
+++ b/open-vm-tools/modules/linux/shared/compat_wait.h
@@ -24,8 +24,6 @@
 #include <linux/poll.h>
 #include <linux/file.h>
 
-#include "compat_file.h"
-
 
 /*
  * The DECLARE_WAITQUEUE() API appeared in 2.3.1