diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-03 05:21:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-03 05:21:18 -0700 |
| commit | e631aa4440d4a34bcab3b9dc64cce78a70c0dc61 (patch) | |
| tree | 5638877431f53d3191130a8d6e5765ae7a2ac76f /include/linux | |
| parent | 8394c855cb9420633d37906fb6e2bcfed13c310f (diff) | |
| parent | 9c67eccb82d6ce0fb44a812ef5f76be970eedd1b (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/buffer_head.h | 7 | ||||
| -rw-r--r-- | include/linux/ext3_fs.h | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 22d3ac8efc6b..1f468b0491ed 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -167,6 +167,7 @@ struct buffer_head *__find_get_block(struct block_device *, sector_t, int); struct buffer_head * __getblk(struct block_device *, sector_t, int); void __brelse(struct buffer_head *); void __bforget(struct buffer_head *); +void __breadahead(struct block_device *, sector_t block, int size); struct buffer_head *__bread(struct block_device *, sector_t block, int size); struct buffer_head *alloc_buffer_head(int gfp_flags); void free_buffer_head(struct buffer_head * bh); @@ -241,6 +242,12 @@ sb_bread(struct super_block *sb, sector_t block) return __bread(sb->s_bdev, block, sb->s_blocksize); } +static inline void +sb_breadahead(struct super_block *sb, sector_t block) +{ + __breadahead(sb->s_bdev, block, sb->s_blocksize); +} + static inline struct buffer_head * sb_getblk(struct super_block *sb, sector_t block) { diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index f077563bcfc3..c360f84fed3d 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h @@ -636,10 +636,14 @@ struct dx_hash_info struct ext3_iloc { struct buffer_head *bh; - struct ext3_inode *raw_inode; + unsigned long offset; unsigned long block_group; }; +static inline struct ext3_inode *ext3_raw_inode(struct ext3_iloc *iloc) +{ + return (struct ext3_inode *) (iloc->bh->b_data + iloc->offset); +} /* * This structure is stuffed into the struct file's private_data field |