From 4214b7eed6f3db42214ac5cf58a1ae7c3fb7dba2 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Thu, 30 Jun 2005 02:59:05 -0700
Subject: [PATCH] --- yaml --- r: 4007 b: refs/heads/master c:
 1d2cc3b87b1694df72ab75cee8e12f8b369577ce h: refs/heads/master i:   4005:
 3eb23a59f07b4c7b30dbac11c02c3649b17cc48c   4003:
 a2da33d405baf88e246a23ed1b3fa5447547b104   3999:
 48ef3adb146540f3c3e3315f20178663501e820a v: v3

---
 [refs]                           |  2 +-
 trunk/fs/freevxfs/vxfs.h         |  1 -
 trunk/fs/freevxfs/vxfs_kcompat.h | 49 --------------------------------
 trunk/fs/freevxfs/vxfs_subr.c    |  1 -
 4 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 trunk/fs/freevxfs/vxfs_kcompat.h

diff --git a/[refs] b/[refs]
index 0b5c00166514..775e64ff7721 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba03bda81e160b2724451074cdcb597d14f7d7e0
+refs/heads/master: 1d2cc3b87b1694df72ab75cee8e12f8b369577ce
diff --git a/trunk/fs/freevxfs/vxfs.h b/trunk/fs/freevxfs/vxfs.h
index 8da0252642a4..583bd78086d8 100644
--- a/trunk/fs/freevxfs/vxfs.h
+++ b/trunk/fs/freevxfs/vxfs.h
@@ -37,7 +37,6 @@
  * superblocks of the Veritas Filesystem.
  */
 #include <linux/types.h>
-#include "vxfs_kcompat.h"
 
 
 /*
diff --git a/trunk/fs/freevxfs/vxfs_kcompat.h b/trunk/fs/freevxfs/vxfs_kcompat.h
deleted file mode 100644
index 342a4cc860f4..000000000000
--- a/trunk/fs/freevxfs/vxfs_kcompat.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _VXFS_KCOMPAT_H
-#define _VXFS_KCOMPAT_H
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-
-#include <linux/blkdev.h>
-
-typedef long sector_t;
-
-/* From include/linux/fs.h (Linux 2.5.2-pre3)  */
-static inline struct buffer_head * sb_bread(struct super_block *sb, int block)
-{
-	return bread(sb->s_dev, block, sb->s_blocksize);
-}
-
-/* Dito.  */
-static inline void map_bh(struct buffer_head *bh, struct super_block *sb, int block)
-{
-	bh->b_state |= 1 << BH_Mapped;
-	bh->b_dev = sb->s_dev;
-	bh->b_blocknr = block;
-}
-
-/* From fs/block_dev.c (Linux 2.5.2-pre2)  */
-static inline int sb_set_blocksize(struct super_block *sb, int size)
-{
-	int bits;
-	if (set_blocksize(sb->s_dev, size) < 0)
-		return 0;
-	sb->s_blocksize = size;
-	for (bits = 9, size >>= 9; size >>= 1; bits++)
-		;
-	sb->s_blocksize_bits = bits;
-	return sb->s_blocksize;
-}
-
-/* Dito.  */
-static inline int sb_min_blocksize(struct super_block *sb, int size)
-{
-	int minsize = get_hardsect_size(sb->s_dev);
-	if (size < minsize)
-		size = minsize;
-	return sb_set_blocksize(sb, size);
-}
-
-#endif /* Kernel 2.4 */
-#endif /* _VXFS_KCOMPAT_H */
diff --git a/trunk/fs/freevxfs/vxfs_subr.c b/trunk/fs/freevxfs/vxfs_subr.c
index 5e305612054a..50aae77651b2 100644
--- a/trunk/fs/freevxfs/vxfs_subr.c
+++ b/trunk/fs/freevxfs/vxfs_subr.c
@@ -36,7 +36,6 @@
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 
-#include "vxfs_kcompat.h"
 #include "vxfs_extern.h"