btrfs: fix uninitialized variable warning

kdave · chrismason-xx · commit aa0467d8d2a0 · 2011-06-04T08:11:38.000-04:00
With Linus' tree, today's linux-next build (powercp ppc64_defconfig) produced this warning: fs/btrfs/delayed-inode.c: In function 'btrfs_delayed_update_inode': fs/btrfs/delayed-inode.c:1598:6: warning: 'ret' may be used uninitialized in this function Introduced by commit 16cdcec ("btrfs: implement delayed inode items operation"). This fixes a bug in btrfs_update_inode(): if the returned value from btrfs_delayed_update_inode is a nonzero garbage, inode stat data are not updated and several call paths may hit a BUG_ON or fail with strange code. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David Sterba <dsterba@suse.cz>
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
@@ -1595,7 +1595,7 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,
 			       struct btrfs_root *root, struct inode *inode)
 {
 	struct btrfs_delayed_node *delayed_node;
-	int ret;
+	int ret = 0;
 
 	delayed_node = btrfs_get_or_create_delayed_node(inode);
 	if (IS_ERR(delayed_node))

Original file line number	Diff line number	Diff line change
`@@ -1595,7 +1595,7 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,`
`1595`	`1595`	`struct btrfs_root root, struct inode inode)`
`1596`	`1596`	`{`
`1597`	`1597`	`struct btrfs_delayed_node *delayed_node;`
`1598`		`- int ret;`
	`1598`	`+ int ret = 0;`
`1599`	`1599`
`1600`	`1600`	`delayed_node = btrfs_get_or_create_delayed_node(inode);`
`1601`	`1601`	`if (IS_ERR(delayed_node))`