From: Florin Malita Date: Sat, 3 Jun 2006 23:30:10 +0000 (-0400) Subject: ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=184d7d20d352c7374f70ebca7468dc8cd5cc618a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks() Signed-off-by: Florin Malita Signed-off-by: Mark Fasheh --- 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. */