diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 16:52:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 16:52:44 -0800 |
| commit | f96c08e8c5935d80bb9fd48c61b5bfa00878519e (patch) | |
| tree | f0e34c84ce69a9e076c23299c94f0fd583a568e0 /fs/ubifs/journal.c | |
| parent | 7420b73dc05ae1faa36b49774210a13d29349c53 (diff) | |
| parent | 27ad27993313312a4ad0047d0a944c425cd511a5 (diff) | |
| download | blackbird-op-linux-f96c08e8c5935d80bb9fd48c61b5bfa00878519e.tar.gz blackbird-op-linux-f96c08e8c5935d80bb9fd48c61b5bfa00878519e.zip | |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: remove fast unmounting
UBIFS: return sensible error codes
UBIFS: remount ro fixes
UBIFS: spelling fix 'date' -> 'data'
UBIFS: sync wbufs after syncing inodes and pages
UBIFS: fix LPT out-of-space bug (again)
UBIFS: fix no_chk_data_crc
UBIFS: fix assertions
UBIFS: ensure orphan area head is initialized
UBIFS: always clean up GC LEB space
UBIFS: add re-mount debugging checks
UBIFS: fix LEB list freeing
UBIFS: simplify locking
UBIFS: document dark_wm and dead_wm better
UBIFS: do not treat all data as short term
UBIFS: constify operations
UBIFS: do not commit twice
Diffstat (limited to 'fs/ubifs/journal.c')
| -rw-r--r-- | fs/ubifs/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 9b7c54e0cd2a..a11ca0958a23 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -208,7 +208,7 @@ again: offs = 0; out: - err = ubifs_wbuf_seek_nolock(wbuf, lnum, offs, UBI_SHORTTERM); + err = ubifs_wbuf_seek_nolock(wbuf, lnum, offs, wbuf->dtype); if (err) goto out_unlock; |
