summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 11:44:51 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 11:44:51 -0800
commit60f29b1e1600d89aee5e529acb4b276a6650cb8b (patch)
treece50c07a6203c5065abe27d016e903285718d771
parent5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6 (diff)
parentc9e3ad6021e5eeb1c25cc4a573bd6427019a7a86 (diff)
downloadlinux-60f29b1e1600d89aee5e529acb4b276a6650cb8b.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Get rid of "may be used uninitialized" warnings
-rw-r--r--fs/jfs/jfs_txnmgr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 6988a1082f58..03893acbfda4 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -1919,7 +1919,8 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
* header ?
*/
if (tlck->type & tlckTRUNCATE) {
- pxd_t pxd; /* truncated extent of xad */
+ /* This odd declaration suppresses a bogus gcc warning */
+ pxd_t pxd = pxd; /* truncated extent of xad */
int twm;
/*