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>

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c
index e8eb8784ed30..a512c0b30e8e 100644
--- a/fs/qnx4/namei.c
+++ b/fs/qnx4/namei.c
@@ -68,7 +68,9 @@ static struct buffer_head *qnx4_find_entry(int len, struct inode *dir,
         block = offset = blkofs = 0;
         while (blkofs * QNX4_BLOCK_SIZE + offset < dir->i_size) {
                 if (!bh) {
-                        bh = qnx4_bread(dir, blkofs, 0);
+                        block = qnx4_block_map(dir, blkofs);
+                        if (block)
+                                bh = sb_bread(dir->i_sb, block);
                         if (!bh) {
                                 blkofs++;
                                 continue;
@@ -76,7 +78,6 @@ static struct buffer_head *qnx4_find_entry(int len, struct inode *dir,
                 }
                 *res_dir = (struct qnx4_inode_entry *) (bh->b_data + offset);
                 if (qnx4_match(len, name, bh, &offset)) {
-                        block = qnx4_block_map( dir, blkofs );
                         *ino = block * QNX4_INODES_PER_BLOCK +
                             (offset / QNX4_DIR_ENTRY_SIZE) - 1;
                         return bh;