diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-24 06:50:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-24 06:50:40 +0200 |
| commit | f4673d6f185533a93990a12d283aead3b0177533 (patch) | |
| tree | 24fb0132b26bf92a3ba7ef0b150b86458de1da21 /fs/ubifs/lpt.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide (diff) | |
| parent | UBIFS: fix error messages spelling (diff) | |
| download | linux-f4673d6f185533a93990a12d283aead3b0177533.tar.xz linux-f4673d6f185533a93990a12d283aead3b0177533.zip | |
Merge tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs
Pull UBIFS fixes from Artem Bityutskiy:
- Fix crash on error which prevents emulated power-cut testing.
- Fix log reply regression introduced in 3.6-rc1.
- Fix UBIFS complaints about too small debug buffer size which.
- Fix error message spelling, and remove incorrect commentary.
* tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs:
UBIFS: fix error messages spelling
UBIFS: fix complaints about too small debug buffer size
UBIFS: fix replay regression
UBIFS: fix crash on error path
UBIFS: remove stale commentary
Diffstat (limited to 'fs/ubifs/lpt.c')
| -rw-r--r-- | fs/ubifs/lpt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index ce33b2beb151..8640920766ed 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -1749,7 +1749,10 @@ int ubifs_lpt_init(struct ubifs_info *c, int rd, int wr) return 0; out_err: - ubifs_lpt_free(c, 0); + if (wr) + ubifs_lpt_free(c, 1); + if (rd) + ubifs_lpt_free(c, 0); return err; } |