aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/inode.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 34e5b0dc9168..0cd126176bbb 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -940,11 +940,11 @@ out:
940 940
941static int 941static int
942ext3_direct_io_get_blocks(struct inode *inode, sector_t iblock, 942ext3_direct_io_get_blocks(struct inode *inode, sector_t iblock,
943 unsigned long max_blocks,
944 struct buffer_head *bh_result, int create) 943 struct buffer_head *bh_result, int create)
945{ 944{
946 handle_t *handle = journal_current_handle(); 945 handle_t *handle = journal_current_handle();
947 int ret = 0; 946 int ret = 0;
947 unsigned max_blocks = bh_result->b_size >> inode->i_blkbits;
948 948
949 if (!create) 949 if (!create)
950 goto get_block; /* A read */ 950 goto get_block; /* A read */
@@ -989,18 +989,10 @@ get_block:
989 return ret; 989 return ret;
990} 990}
991 991
992static int ext3_get_blocks(struct inode *inode, sector_t iblock,
993 unsigned long maxblocks, struct buffer_head *bh_result,
994 int create)
995{
996 return ext3_direct_io_get_blocks(inode, iblock, maxblocks,
997 bh_result, create);
998}
999
1000static int ext3_get_block(struct inode *inode, sector_t iblock, 992static int ext3_get_block(struct inode *inode, sector_t iblock,
1001 struct buffer_head *bh_result, int create) 993 struct buffer_head *bh_result, int create)
1002{ 994{
1003 return ext3_get_blocks(inode, iblock, 1, bh_result, create); 995 return ext3_direct_io_get_blocks(inode, iblock, bh_result, create);
1004} 996}
1005 997
1006/* 998/*