From 13fdb2436452ea5a64d65b6ed2757aeed4159f47 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 28 Jun 2006 10:13:52 +1000 Subject: [PATCH] --- yaml --- r: 30923 b: refs/heads/master c: 6fdf8ccc09fd764a9cce11006aa3fca53ac1c895 h: refs/heads/master i: 30921: 4ade9f50932060292628f5c2ba82cbdaad081e8b 30919: 4900892166f571ae83f86c5bb9f68796fa32da94 v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_inode.c | 4 ++-- trunk/fs/xfs/xfs_log_recover.c | 2 ++ trunk/fs/xfs/xfs_mount.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 17fcde1d71ca..d57e7b1fc437 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73024cf11522c0233228453984b2a2b37885e336 +refs/heads/master: 6fdf8ccc09fd764a9cce11006aa3fca53ac1c895 diff --git a/trunk/fs/xfs/xfs_inode.c b/trunk/fs/xfs/xfs_inode.c index 5fa0adb7e173..86c1bf0bba9e 100644 --- a/trunk/fs/xfs/xfs_inode.c +++ b/trunk/fs/xfs/xfs_inode.c @@ -1961,9 +1961,9 @@ xfs_iunlink_remove( xfs_agino_t agino; xfs_agino_t next_agino; xfs_buf_t *last_ibp; - xfs_dinode_t *last_dip; + xfs_dinode_t *last_dip = NULL; short bucket_index; - int offset, last_offset; + int offset, last_offset = 0; int error; int agi_ok; diff --git a/trunk/fs/xfs/xfs_log_recover.c b/trunk/fs/xfs/xfs_log_recover.c index 55b4237c2153..3cb678e3a132 100644 --- a/trunk/fs/xfs/xfs_log_recover.c +++ b/trunk/fs/xfs/xfs_log_recover.c @@ -990,6 +990,8 @@ xlog_find_zeroed( xfs_daddr_t num_scan_bblks; int error, log_bbnum = log->l_logBBsize; + *blk_no = 0; + /* check totally zeroed log */ bp = xlog_get_bp(log, 1); if (!bp) diff --git a/trunk/fs/xfs/xfs_mount.c b/trunk/fs/xfs/xfs_mount.c index 10dbf203c62f..22d3a1c75474 100644 --- a/trunk/fs/xfs/xfs_mount.c +++ b/trunk/fs/xfs/xfs_mount.c @@ -2026,7 +2026,7 @@ xfs_icsb_balance_counter( xfs_sb_field_t field, int flags) { - uint64_t count, resid = 0; + uint64_t count, resid; int weight = num_online_cpus(); int s; @@ -2058,6 +2058,7 @@ xfs_icsb_balance_counter( break; default: BUG(); + count = resid = 0; /* quiet, gcc */ break; }