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>

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>
Florin Malita · Mark Fasheh
1 parent 784270435b
Showing 1 changed file with 1 additions and 8 deletions Side-by-side Diff
fs/ocfs2/aops.c
@@ -558,15 +558,8 @@
 	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
...	...	@@ -558,15 +558,8 @@
558	558	u64 vbo_max; /* file offset, max_blocks from iblock */
559	559	u64 p_blkno;
560	560	int contig_blocks;
561		- unsigned char blocksize_bits;
	561	+ unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits;
562	562	unsigned long max_blocks = bh_result->b_size >> inode->i_blkbits;
563		-
564		- if (!inode \|\| !bh_result) {
565		- mlog(ML_ERROR, "inode or bh_result is null\n");
566		- return -EIO;
567		- }
568		-
569		- blocksize_bits = inode->i_sb->s_blocksize_bits;
570	563
571	564	/* This function won't even be called if the request isn't all
572	565	* nicely aligned and of the right size, so there's no need