diff options
author | Nathan Scott <nathans@sgi.com> | 2006-06-27 20:13:52 -0400 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-06-27 20:13:52 -0400 |
commit | 6fdf8ccc09fd764a9cce11006aa3fca53ac1c895 (patch) | |
tree | 0826433cc788979489ba1a2cc0df9cdad4cee9c5 | |
parent | 73024cf11522c0233228453984b2a2b37885e336 (diff) |
[XFS] Rework code snippets slightly to remove remaining recent-gcc
warnings.
SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:26364a
Signed-off-by: Nathan Scott <nathans@sgi.com>
-rw-r--r-- | fs/xfs/xfs_inode.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_log_recover.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 5fa0adb7e173..86c1bf0bba9e 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -1961,9 +1961,9 @@ xfs_iunlink_remove( | |||
1961 | xfs_agino_t agino; | 1961 | xfs_agino_t agino; |
1962 | xfs_agino_t next_agino; | 1962 | xfs_agino_t next_agino; |
1963 | xfs_buf_t *last_ibp; | 1963 | xfs_buf_t *last_ibp; |
1964 | xfs_dinode_t *last_dip; | 1964 | xfs_dinode_t *last_dip = NULL; |
1965 | short bucket_index; | 1965 | short bucket_index; |
1966 | int offset, last_offset; | 1966 | int offset, last_offset = 0; |
1967 | int error; | 1967 | int error; |
1968 | int agi_ok; | 1968 | int agi_ok; |
1969 | 1969 | ||
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 55b4237c2153..3cb678e3a132 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
@@ -990,6 +990,8 @@ xlog_find_zeroed( | |||
990 | xfs_daddr_t num_scan_bblks; | 990 | xfs_daddr_t num_scan_bblks; |
991 | int error, log_bbnum = log->l_logBBsize; | 991 | int error, log_bbnum = log->l_logBBsize; |
992 | 992 | ||
993 | *blk_no = 0; | ||
994 | |||
993 | /* check totally zeroed log */ | 995 | /* check totally zeroed log */ |
994 | bp = xlog_get_bp(log, 1); | 996 | bp = xlog_get_bp(log, 1); |
995 | if (!bp) | 997 | if (!bp) |
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 10dbf203c62f..22d3a1c75474 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -2026,7 +2026,7 @@ xfs_icsb_balance_counter( | |||
2026 | xfs_sb_field_t field, | 2026 | xfs_sb_field_t field, |
2027 | int flags) | 2027 | int flags) |
2028 | { | 2028 | { |
2029 | uint64_t count, resid = 0; | 2029 | uint64_t count, resid; |
2030 | int weight = num_online_cpus(); | 2030 | int weight = num_online_cpus(); |
2031 | int s; | 2031 | int s; |
2032 | 2032 | ||
@@ -2058,6 +2058,7 @@ xfs_icsb_balance_counter( | |||
2058 | break; | 2058 | break; |
2059 | default: | 2059 | default: |
2060 | BUG(); | 2060 | BUG(); |
2061 | count = resid = 0; /* quiet, gcc */ | ||
2061 | break; | 2062 | break; |
2062 | } | 2063 | } |
2063 | 2064 | ||