diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-02-13 20:57:12 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:29:51 -0400 |
commit | 8f82ecae53347ec65721e1c0683c3f26647e3c97 (patch) | |
tree | 594d1064acfda1f44aa4eaf0a2fde01ada760b2c /fs/qnx4/inode.c | |
parent | 19e5109fef2c368ab3f8a5157270f87f4a7c0326 (diff) |
qnx4: get rid of qnx4_bread/qnx4_getblk
pointless, since the only caller will want the physical block
number anyway; might as well call qnx4_block_map() and use
sb_bread()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/qnx4/inode.c')
-rw-r--r-- | fs/qnx4/inode.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 14a0ba0f0c1c..7900a813d90f 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -52,38 +52,6 @@ static int qnx4_remount(struct super_block *sb, int *flags, char *data) | |||
52 | return 0; | 52 | return 0; |
53 | } | 53 | } |
54 | 54 | ||
55 | static struct buffer_head *qnx4_getblk(struct inode *inode, int nr, | ||
56 | int create) | ||
57 | { | ||
58 | struct buffer_head *result = NULL; | ||
59 | |||
60 | if ( nr >= 0 ) | ||
61 | nr = qnx4_block_map( inode, nr ); | ||
62 | if (nr) { | ||
63 | result = sb_getblk(inode->i_sb, nr); | ||
64 | return result; | ||
65 | } | ||
66 | return NULL; | ||
67 | } | ||
68 | |||
69 | struct buffer_head *qnx4_bread(struct inode *inode, int block, int create) | ||
70 | { | ||
71 | struct buffer_head *bh; | ||
72 | |||
73 | bh = qnx4_getblk(inode, block, create); | ||
74 | if (!bh || buffer_uptodate(bh)) { | ||
75 | return bh; | ||
76 | } | ||
77 | ll_rw_block(READ, 1, &bh); | ||
78 | wait_on_buffer(bh); | ||
79 | if (buffer_uptodate(bh)) { | ||
80 | return bh; | ||
81 | } | ||
82 | brelse(bh); | ||
83 | |||
84 | return NULL; | ||
85 | } | ||
86 | |||
87 | static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_head *bh, int create ) | 55 | static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_head *bh, int create ) |
88 | { | 56 | { |
89 | unsigned long phys; | 57 | unsigned long phys; |