diff options
| author | Florin Malita <fmalita@gmail.com> | 2006-06-03 19:30:10 -0400 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-29 16:13:35 -0700 |
| commit | 184d7d20d352c7374f70ebca7468dc8cd5cc618a (patch) | |
| tree | bcea4e8f5eba60f03ff0c7980b4e13b4b579bf2b /fs/ocfs2 | |
| parent | 784270435b001164054e803421a624ef1098519d (diff) | |
| download | blackbird-op-linux-184d7d20d352c7374f70ebca7468dc8cd5cc618a.tar.gz blackbird-op-linux-184d7d20d352c7374f70ebca7468dc8cd5cc618a.zip | |
ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks()
Signed-off-by: Florin Malita <fmalita@gmail.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/aops.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index cca71317b6d6..f1d1c342ce01 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -558,16 +558,9 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, u64 vbo_max; /* file offset, max_blocks from iblock */ u64 p_blkno; int contig_blocks; - unsigned char blocksize_bits; + unsigned char blocksize_bits = inode->i_sb->s_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"); - return -EIO; - } - - blocksize_bits = inode->i_sb->s_blocksize_bits; - /* This function won't even be called if the request isn't all * nicely aligned and of the right size, so there's no need * for us to check any of that. */ |
