summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2011-06-03 16:29:08 +0200
committerChris Mason <chris.mason@oracle.com>2011-06-04 08:11:38 -0400
commitaa0467d8d2a00e75b2bb6a56a4ee6d70c5d1928f (patch)
tree0139c403353d9e1ab771fc7c9049e5c334329d17
parent7841cb2898f66a73062c64d0ef5733dde7279e46 (diff)
downloadop-kernel-dev-aa0467d8d2a00e75b2bb6a56a4ee6d70c5d1928f.zip
op-kernel-dev-aa0467d8d2a00e75b2bb6a56a4ee6d70c5d1928f.tar.gz
btrfs: fix uninitialized variable warning
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 16cdcec736cd ("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>
-rw-r--r--fs/btrfs/delayed-inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index c61c32c..6462c29 100644
--- 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))
OpenPOWER on IntegriCloud