From 2a2b322018a1fbd96dc13590a86369976a38b9a5 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Sat, 3 Jun 2006 19:30:10 -0400 Subject: [PATCH] --- yaml --- r: 31364 b: refs/heads/master c: 184d7d20d352c7374f70ebca7468dc8cd5cc618a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/aops.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 1a9a3c5736a8..d246cf63b9ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 784270435b001164054e803421a624ef1098519d +refs/heads/master: 184d7d20d352c7374f70ebca7468dc8cd5cc618a diff --git a/trunk/fs/ocfs2/aops.c b/trunk/fs/ocfs2/aops.c index cca71317b6d6..f1d1c342ce01 100644 --- a/trunk/fs/ocfs2/aops.c +++ b/trunk/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. */