diff options
| -rw-r--r-- | fs/freevxfs/vxfs.h | 1 | ||||
| -rw-r--r-- | fs/freevxfs/vxfs_kcompat.h | 49 | ||||
| -rw-r--r-- | fs/freevxfs/vxfs_subr.c | 1 |
3 files changed, 0 insertions, 51 deletions
diff --git a/fs/freevxfs/vxfs.h b/fs/freevxfs/vxfs.h index 8da0252642a4..583bd78086d8 100644 --- a/fs/freevxfs/vxfs.h +++ b/fs/freevxfs/vxfs.h | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | * superblocks of the Veritas Filesystem. | 37 | * superblocks of the Veritas Filesystem. |
| 38 | */ | 38 | */ |
| 39 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 40 | #include "vxfs_kcompat.h" | ||
| 41 | 40 | ||
| 42 | 41 | ||
| 43 | /* | 42 | /* |
diff --git a/fs/freevxfs/vxfs_kcompat.h b/fs/freevxfs/vxfs_kcompat.h deleted file mode 100644 index 342a4cc860f4..000000000000 --- a/fs/freevxfs/vxfs_kcompat.h +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | #ifndef _VXFS_KCOMPAT_H | ||
| 2 | #define _VXFS_KCOMPAT_H | ||
| 3 | |||
| 4 | #include <linux/version.h> | ||
| 5 | |||
| 6 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) | ||
| 7 | |||
| 8 | #include <linux/blkdev.h> | ||
| 9 | |||
| 10 | typedef long sector_t; | ||
| 11 | |||
| 12 | /* From include/linux/fs.h (Linux 2.5.2-pre3) */ | ||
| 13 | static inline struct buffer_head * sb_bread(struct super_block *sb, int block) | ||
| 14 | { | ||
| 15 | return bread(sb->s_dev, block, sb->s_blocksize); | ||
| 16 | } | ||
| 17 | |||
| 18 | /* Dito. */ | ||
| 19 | static inline void map_bh(struct buffer_head *bh, struct super_block *sb, int block) | ||
| 20 | { | ||
| 21 | bh->b_state |= 1 << BH_Mapped; | ||
| 22 | bh->b_dev = sb->s_dev; | ||
| 23 | bh->b_blocknr = block; | ||
| 24 | } | ||
| 25 | |||
| 26 | /* From fs/block_dev.c (Linux 2.5.2-pre2) */ | ||
| 27 | static inline int sb_set_blocksize(struct super_block *sb, int size) | ||
| 28 | { | ||
| 29 | int bits; | ||
| 30 | if (set_blocksize(sb->s_dev, size) < 0) | ||
| 31 | return 0; | ||
| 32 | sb->s_blocksize = size; | ||
| 33 | for (bits = 9, size >>= 9; size >>= 1; bits++) | ||
| 34 | ; | ||
| 35 | sb->s_blocksize_bits = bits; | ||
| 36 | return sb->s_blocksize; | ||
| 37 | } | ||
| 38 | |||
| 39 | /* Dito. */ | ||
| 40 | static inline int sb_min_blocksize(struct super_block *sb, int size) | ||
| 41 | { | ||
| 42 | int minsize = get_hardsect_size(sb->s_dev); | ||
| 43 | if (size < minsize) | ||
| 44 | size = minsize; | ||
| 45 | return sb_set_blocksize(sb, size); | ||
| 46 | } | ||
| 47 | |||
| 48 | #endif /* Kernel 2.4 */ | ||
| 49 | #endif /* _VXFS_KCOMPAT_H */ | ||
diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c index 5e305612054a..50aae77651b2 100644 --- a/fs/freevxfs/vxfs_subr.c +++ b/fs/freevxfs/vxfs_subr.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
| 37 | #include <linux/pagemap.h> | 37 | #include <linux/pagemap.h> |
| 38 | 38 | ||
| 39 | #include "vxfs_kcompat.h" | ||
| 40 | #include "vxfs_extern.h" | 39 | #include "vxfs_extern.h" |
| 41 | 40 | ||
| 42 | 41 | ||
