diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-01 09:56:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-01 09:56:26 +0200 |
| commit | 087021ba41e9481202103d51d3dd0c4706899a2b (patch) | |
| tree | bf5d67420fd176682a1f8f1e9342ad397c23937a /fs/jffs2/scan.c | |
| parent | fb9c818873a788c5c01c9868cc6050df96e2c7df (diff) | |
| parent | e83c2b0ff325f52dda1aff3572d0e1516216c54b (diff) | |
Merge branch 'linus' into perfcounters/urgent
Merge reason: this branch was on a .30-ish base before, update
it to an almost-.31-rc2 upstream base to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/jffs2/scan.c')
| -rw-r--r-- | fs/jffs2/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index 1d437de1e9a..7515e73e2bf 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -196,7 +196,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) if (c->nextblock) { ret = file_dirty(c, c->nextblock); if (ret) - return ret; + goto out; /* deleting summary information of the old nextblock */ jffs2_sum_reset_collected(c->summary); } @@ -207,7 +207,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) } else { ret = file_dirty(c, jeb); if (ret) - return ret; + goto out; } break; |