diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /fs/hpfs | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/buffer.c | 4 | ||||
| -rw-r--r-- | fs/hpfs/file.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/hpfs/buffer.c b/fs/hpfs/buffer.c index 5f5ec196f..c7b63f358 100644 --- a/fs/hpfs/buffer.c +++ b/fs/hpfs/buffer.c @@ -127,7 +127,7 @@ void *hpfs_map_sector(struct super_block *s, unsigned secno, struct buffer_head if (!ahead || secno + ahead >= s->s_hpfs_fs_size) *bhp = bh = bread(dev, secno, 512); - else *bhp = bh = breada(dev, secno, 512, 0, (ahead + 1) << 9); + else *bhp = bh = bread(dev, secno, 512); if (bh != NULL) return bh->b_data; else { @@ -175,7 +175,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe if (!ahead || secno + 4 + ahead > s->s_hpfs_fs_size) qbh->bh[0] = bh = bread(dev, secno, 512); - else qbh->bh[0] = bh = breada(dev, secno, 512, 0, (ahead + 4) << 9); + else qbh->bh[0] = bh = bread(dev, secno, 512); if (!bh) goto bail0; memcpy(data, bh->b_data, 512); diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index fb5f566e7..a9675ef54 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -93,7 +93,7 @@ int hpfs_get_block(struct inode *inode, long iblock, struct buffer_head *bh_resu return 0; } -static int hpfs_writepage(struct file *file, struct page *page) +static int hpfs_writepage(struct page *page) { return block_write_full_page(page,hpfs_get_block); } |