Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d2cc3b8 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[PATCH] freevxfs: remove 2.4 compatability 



This patch removes 2.4 compatability header from freevxfs.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ba03bda8

fs/freevxfs/vxfs.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
 * superblocks of the Veritas Filesystem.

 */

#include <linux/types.h>

#include "vxfs_kcompat.h"





/*

fs/freevxfs/vxfs_kcompat.h

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
#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 */

fs/freevxfs/vxfs_subr.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/slab.h>

#include <linux/pagemap.h>



#include "vxfs_kcompat.h"

#include "vxfs_extern.h"