diff -urpN --exclude-from=/home/davej/.exclude bk-linus/fs/freevxfs/vxfs_kcompat.h linux-2.5/fs/freevxfs/vxfs_kcompat.h --- bk-linus/fs/freevxfs/vxfs_kcompat.h 2002-11-21 02:20:03.000000000 +0000 +++ linux-2.5/fs/freevxfs/vxfs_kcompat.h 2002-11-21 18:02:08.000000000 +0000 @@ -23,27 +23,5 @@ static inline void map_bh(struct buffer_ 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 */