Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fba8137 authored by Tao Ma's avatar Tao Ma Committed by Joel Becker
Browse files

ocfs2: Fix 2 warning during ocfs2 make. 



fs/ocfs2/dir.c: In function ‘ocfs2_extend_dir’:
fs/ocfs2/dir.c:2700: warning: ‘ret’ may be used uninitialized in this function

fs/ocfs2/suballoc.c: In function ‘ocfs2_get_suballoc_slot_bit’:
fs/ocfs2/suballoc.c:2216: warning: comparison is always true due to limited range of data type

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 035a5711

fs/ocfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -2697,7 +2697,7 @@ static int ocfs2_dx_dir_index_block(struct inode *dir, 
				    u32 *num_dx_entries,

				    struct buffer_head *dirent_bh)

{

	int ret, namelen, i;

	int ret = 0, namelen, i;

	char *de_buf, *limit;

	struct ocfs2_dir_entry *de;

	struct buffer_head *dx_leaf_bh;

fs/ocfs2/suballoc.c

+1 −1
Original line number Diff line number Diff line
@@ -2213,7 +2213,7 @@ static int ocfs2_get_suballoc_slot_bit(struct ocfs2_super *osb, u64 blkno, 
		goto bail;

	}



	if (le16_to_cpu(inode_fe->i_suballoc_slot) != OCFS2_INVALID_SLOT &&

	if (le16_to_cpu(inode_fe->i_suballoc_slot) != (u16)OCFS2_INVALID_SLOT &&

	    (u32)le16_to_cpu(inode_fe->i_suballoc_slot) > osb->max_slots - 1) {

		mlog(ML_ERROR, "inode %llu has invalid suballoc slot %u\n",

		     blkno, (u32)le16_to_cpu(inode_fe->i_suballoc_slot));