45254b4fb2
Merge include/linux/efs_fs{_i,_dir}.h into fs/efs/efs.h. efs_vh.h remains
there because this is the IRIX volume header and shouldn't really be
handled by efs but by the partitioning code. efs_sb.h remains there for
now because it's exported to userspace. Of course this wrong and aboot
should have a copy of it's own, but I'll leave that to a separate patch to
avoid any contention.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
61 lines
1.2 KiB
C
61 lines
1.2 KiB
C
/*
|
|
* file.c
|
|
*
|
|
* Copyright (c) 1999 Al Smith
|
|
*
|
|
* Portions derived from work (c) 1995,1996 Christian Vogelgsang.
|
|
*/
|
|
|
|
#include <linux/buffer_head.h>
|
|
#include "efs.h"
|
|
|
|
int efs_get_block(struct inode *inode, sector_t iblock,
|
|
struct buffer_head *bh_result, int create)
|
|
{
|
|
int error = -EROFS;
|
|
long phys;
|
|
|
|
if (create)
|
|
return error;
|
|
if (iblock >= inode->i_blocks) {
|
|
#ifdef DEBUG
|
|
/*
|
|
* i have no idea why this happens as often as it does
|
|
*/
|
|
printk(KERN_WARNING "EFS: bmap(): block %d >= %ld (filesize %ld)\n",
|
|
block,
|
|
inode->i_blocks,
|
|
inode->i_size);
|
|
#endif
|
|
return 0;
|
|
}
|
|
phys = efs_map_block(inode, iblock);
|
|
if (phys)
|
|
map_bh(bh_result, inode->i_sb, phys);
|
|
return 0;
|
|
}
|
|
|
|
int efs_bmap(struct inode *inode, efs_block_t block) {
|
|
|
|
if (block < 0) {
|
|
printk(KERN_WARNING "EFS: bmap(): block < 0\n");
|
|
return 0;
|
|
}
|
|
|
|
/* are we about to read past the end of a file ? */
|
|
if (!(block < inode->i_blocks)) {
|
|
#ifdef DEBUG
|
|
/*
|
|
* i have no idea why this happens as often as it does
|
|
*/
|
|
printk(KERN_WARNING "EFS: bmap(): block %d >= %ld (filesize %ld)\n",
|
|
block,
|
|
inode->i_blocks,
|
|
inode->i_size);
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
return efs_map_block(inode, block);
|
|
}
|