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/hfsplus/inode.c | |
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/hfsplus/inode.c')
-rw-r--r-- | fs/hfsplus/inode.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index 12ed2b7d046b..9fbe4d2aeece 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c | |||
@@ -93,17 +93,6 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask) | |||
93 | return res ? try_to_free_buffers(page) : 0; | 93 | return res ? try_to_free_buffers(page) : 0; |
94 | } | 94 | } |
95 | 95 | ||
96 | static int hfsplus_get_blocks(struct inode *inode, sector_t iblock, unsigned long max_blocks, | ||
97 | struct buffer_head *bh_result, int create) | ||
98 | { | ||
99 | int ret; | ||
100 | |||
101 | ret = hfsplus_get_block(inode, iblock, bh_result, create); | ||
102 | if (!ret) | ||
103 | bh_result->b_size = (1 << inode->i_blkbits); | ||
104 | return ret; | ||
105 | } | ||
106 | |||
107 | static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, | 96 | static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, |
108 | const struct iovec *iov, loff_t offset, unsigned long nr_segs) | 97 | const struct iovec *iov, loff_t offset, unsigned long nr_segs) |
109 | { | 98 | { |
@@ -111,7 +100,7 @@ static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, | |||
111 | struct inode *inode = file->f_dentry->d_inode->i_mapping->host; | 100 | struct inode *inode = file->f_dentry->d_inode->i_mapping->host; |
112 | 101 | ||
113 | return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, | 102 | return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, |
114 | offset, nr_segs, hfsplus_get_blocks, NULL); | 103 | offset, nr_segs, hfsplus_get_block, NULL); |
115 | } | 104 | } |
116 | 105 | ||
117 | static int hfsplus_writepages(struct address_space *mapping, | 106 | static int hfsplus_writepages(struct address_space *mapping, |