tree b4ef5c5d2d1e127e9ea80bd047247fdb2d1547ed
parent be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca
parent 6be7fa06eb4d721df734bd0946b5e63b27c0589b
author Linus Torvalds <torvalds@linux-foundation.org> 1269959095 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269959095 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
  [LogFS] Erase new journal segments
  [LogFS] Move reserved segments with journal
  [LogFS] Clear PagePrivate when moving journal
  Simplify and fix pad_wbuf
  Prevent data corruption in logfs_rewrite_block()
  Use deactivate_locked_super
  Fix logfs_get_sb_final error path
  Write out both superblocks on mismatch
  Prevent schedule while atomic in __logfs_readdir
  Plug memory leak in writeseg_end_io
  Limit max_pages for insane devices
  Open segment file before using it