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

Commit 4f05028f authored by Ryusuke Konishi's avatar Ryusuke Konishi Committed by Linus Torvalds
Browse files

nilfs2: fix gcc uninitialized-variable warnings in powerpc build 

Some false positive warnings are reported for powerpc build.

The following warnings are reported in
 http://kisskb.ellerman.id.au/kisskb/buildresult/12519703/

   CC      fs/nilfs2/super.o
 fs/nilfs2/super.c: In function 'nilfs_resize_fs':
 fs/nilfs2/super.c:376:2: warning: 'blocknr' may be used uninitialized in this function [-Wuninitialized]
 fs/nilfs2/super.c:362:11: note: 'blocknr' was declared here
   CC      fs/nilfs2/recovery.o
 fs/nilfs2/recovery.c: In function 'nilfs_salvage_orphan_logs':
 fs/nilfs2/recovery.c:631:21: warning: 'sum' may be used uninitialized in this function [-Wuninitialized]
 fs/nilfs2/recovery.c:585:32: note: 'sum' was declared here
 fs/nilfs2/recovery.c: In function 'nilfs_search_super_root':
 fs/nilfs2/recovery.c:873:11: warning: 'sum' may be used uninitialized in this function [-Wuninitialized]

Another similar warning is reported in
 http://kisskb.ellerman.id.au/kisskb/buildresult/12520079/



   CC      fs/nilfs2/btree.o
 fs/nilfs2/btree.c: In function 'nilfs_btree_convert_and_insert':
 include/asm-generic/bitops/non-atomic.h:105:20: warning: 'bh' may be used uninitialized in this function [-Wuninitialized]
 fs/nilfs2/btree.c:1859:22: note: 'bh' was declared here

This cleans out these warnings by forcing the variables to be initialized.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 09ef29e0

fs/nilfs2/btree.c

+1 −1
Original line number Diff line number Diff line
@@ -1851,7 +1851,7 @@ int nilfs_btree_convert_and_insert(struct nilfs_bmap *btree, 
				   __u64 key, __u64 ptr,

				   const __u64 *keys, const __u64 *ptrs, int n)

{

	struct buffer_head *bh;

	struct buffer_head *bh = NULL;

	union nilfs_bmap_ptr_req dreq, nreq, *di, *ni;

	struct nilfs_bmap_stats stats;

	int ret;

fs/nilfs2/recovery.c

+2 −2
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static int nilfs_do_roll_forward(struct the_nilfs *nilfs, 
				 struct nilfs_recovery_info *ri)

{

	struct buffer_head *bh_sum = NULL;

	struct nilfs_segment_summary *sum;

	struct nilfs_segment_summary *sum = NULL;

	sector_t pseg_start;

	sector_t seg_start, seg_end;  /* Starting/ending DBN of full segment */

	unsigned long nsalvaged_blocks = 0;
@@ -814,7 +814,7 @@ int nilfs_search_super_root(struct the_nilfs *nilfs, 
			    struct nilfs_recovery_info *ri)

{

	struct buffer_head *bh_sum = NULL;

	struct nilfs_segment_summary *sum;

	struct nilfs_segment_summary *sum = NULL;

	sector_t pseg_start, pseg_end, sr_pseg_start = 0;

	sector_t seg_start, seg_end; /* range of full segment (block number) */

	sector_t b, end;

fs/nilfs2/super.c

+4 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static int nilfs_move_2nd_super(struct super_block *sb, loff_t sb2off) 
	struct nilfs_super_block *nsbp;

	sector_t blocknr, newblocknr;

	unsigned long offset;

	int sb2i = -1;  /* array index of the secondary superblock */

	int sb2i;  /* array index of the secondary superblock */

	int ret = 0;



	/* nilfs->ns_sem must be locked by the caller. */
@@ -372,6 +372,9 @@ static int nilfs_move_2nd_super(struct super_block *sb, loff_t sb2off) 
	} else if (nilfs->ns_sbh[0]->b_blocknr > nilfs->ns_first_data_block) {

		sb2i = 0;

		blocknr = nilfs->ns_sbh[0]->b_blocknr;

	} else {

		sb2i = -1;

		blocknr = 0;

	}

	if (sb2i >= 0 && (u64)blocknr << nilfs->ns_blocksize_bits == sb2off)

		goto out;  /* super block location is unchanged */