From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Mar 2010 14:24:55 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
X-Git-Tag: upstream/snapshot3+hdmi~14937
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4660d3d240ac6c92cd3ad33657ca302026bdc24b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge git://git./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
---

4660d3d240ac6c92cd3ad33657ca302026bdc24b