diff options
| author | Badari Pulavarty <pbadari@us.ibm.com> | 2006-03-26 01:38:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 08:57:01 -0800 |
| commit | 1d8fa7a2b9a39d18727acc5c468e870df606c852 (patch) | |
| tree | 41537fe9ea5478f3243e3301184dc13980f8201f /fs/ocfs2/aops.c | |
| parent | fa30bd058b746c0e2318a77ff8b4977faa924c2c (diff) | |
| download | kernel_samsung_aries-1d8fa7a2b9a39d18727acc5c468e870df606c852.zip kernel_samsung_aries-1d8fa7a2b9a39d18727acc5c468e870df606c852.tar.gz kernel_samsung_aries-1d8fa7a2b9a39d18727acc5c468e870df606c852.tar.bz2 | |
[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/aops.c')
| -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 bf931ba..0d858d0 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -540,7 +540,6 @@ bail: * fs_count, map_bh, dio->rw == WRITE); */ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, - unsigned long max_blocks, struct buffer_head *bh_result, int create) { int ret; @@ -548,6 +547,7 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, u64 p_blkno; int contig_blocks; unsigned char blocksize_bits; + unsigned long max_blocks = bh_result->b_size >> inode->i_blkbits; if (!inode || !bh_result) { mlog(ML_ERROR, "inode or bh_result is null\n"); |