diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/jffs2/gc.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/jffs2/gc.c')
| -rw-r--r-- | fs/jffs2/gc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c index 090c556ffed2..3b6f2fa12cff 100644 --- a/fs/jffs2/gc.c +++ b/fs/jffs2/gc.c | |||
| @@ -700,7 +700,8 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_ | |||
| 700 | struct jffs2_raw_inode ri; | 700 | struct jffs2_raw_inode ri; |
| 701 | struct jffs2_node_frag *last_frag; | 701 | struct jffs2_node_frag *last_frag; |
| 702 | union jffs2_device_node dev; | 702 | union jffs2_device_node dev; |
| 703 | char *mdata = NULL, mdatalen = 0; | 703 | char *mdata = NULL; |
| 704 | int mdatalen = 0; | ||
| 704 | uint32_t alloclen, ilen; | 705 | uint32_t alloclen, ilen; |
| 705 | int ret; | 706 | int ret; |
| 706 | 707 | ||