diff options
author | Badari Pulavarty <pbadari@us.ibm.com> | 2006-03-26 04:38:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:57:01 -0500 |
commit | 1d8fa7a2b9a39d18727acc5c468e870df606c852 (patch) | |
tree | 41537fe9ea5478f3243e3301184dc13980f8201f /fs/ocfs2 | |
parent | fa30bd058b746c0e2318a77ff8b4977faa924c2c (diff) |
[PATCH] remove ->get_blocks() support
Now that get_block() can handle mapping multiple disk blocks, no need to have
->get_blocks(). This patch removes fs specific ->get_blocks() added for DIO
and makes it users use get_block() instead.
Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/aops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index bf931ba1d364..0d858d0b25be 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
@@ -540,7 +540,6 @@ bail: | |||
540 | * fs_count, map_bh, dio->rw == WRITE); | 540 | * fs_count, map_bh, dio->rw == WRITE); |
541 | */ | 541 | */ |
542 | static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, | 542 | static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, |
543 | unsigned long max_blocks, | ||
544 | struct buffer_head *bh_result, int create) | 543 | struct buffer_head *bh_result, int create) |
545 | { | 544 | { |
546 | int ret; | 545 | int ret; |
@@ -548,6 +547,7 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, | |||
548 | u64 p_blkno; | 547 | u64 p_blkno; |
549 | int contig_blocks; | 548 | int contig_blocks; |
550 | unsigned char blocksize_bits; | 549 | unsigned char blocksize_bits; |
550 | unsigned long max_blocks = bh_result->b_size >> inode->i_blkbits; | ||
551 | 551 | ||
552 | if (!inode || !bh_result) { | 552 | if (!inode || !bh_result) { |
553 | mlog(ML_ERROR, "inode or bh_result is null\n"); | 553 | mlog(ML_ERROR, "inode or bh_result is null\n"); |