diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 11:15:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 11:15:18 -0400 |
commit | 33e6c1a0de818d3698cdab27c42915661011319d (patch) | |
tree | 763b8d7ab872471fad3a95a4bb8589903bb25880 /fs/ubifs/commit.c | |
parent | 0b887ef19d7319263f31babc2a7855bc92865c0e (diff) | |
parent | 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 (diff) |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: fix debugging dump
UBIFS: improve lprops dump
UBIFS: various minor commentary fixes
UBIFS: improve journal head debugging prints
UBIFS: define journal head numbers in ubifs-media.h
UBIFS: amend commentaries
UBIFS: check ubifs_scan error codes better
UBIFS: do not print scary error messages needlessly
UBIFS: add inode size debugging check
UBIFS: constify file and inode operations
UBIFS: remove unneeded call from ubifs_sync_fs
UBIFS: kill BKL
UBIFS: remove unused functions
UBIFS: suppress compilation warning
Diffstat (limited to 'fs/ubifs/commit.c')
-rw-r--r-- | fs/ubifs/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c index f3a7945527fb..4775af401167 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c | |||
@@ -510,7 +510,7 @@ int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot) | |||
510 | int lnum, offs, len, err = 0, uninitialized_var(last_level), child_cnt; | 510 | int lnum, offs, len, err = 0, uninitialized_var(last_level), child_cnt; |
511 | int first = 1, iip; | 511 | int first = 1, iip; |
512 | struct ubifs_debug_info *d = c->dbg; | 512 | struct ubifs_debug_info *d = c->dbg; |
513 | union ubifs_key lower_key, upper_key, l_key, u_key; | 513 | union ubifs_key uninitialized_var(lower_key), upper_key, l_key, u_key; |
514 | unsigned long long uninitialized_var(last_sqnum); | 514 | unsigned long long uninitialized_var(last_sqnum); |
515 | struct ubifs_idx_node *idx; | 515 | struct ubifs_idx_node *idx; |
516 | struct list_head list; | 516 | struct list_head list; |