]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Apr 2010 19:31:12 +0000 (12:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Apr 2010 19:31:12 +0000 (12:31 -0700)
commit57bbdbc0fa6afccba35ace64d5bedd051f41a579
treea802e21e60c7e342ad72319853b64e214091b6a9
parent08e4844c6adb60166c20c729b68ca3e8a44b6860
parentb1e0fdddf9544d9683e2bd23ba062e1da91cdd7d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
  [LogFS] Split large truncated into smaller chunks
  [LogFS] Set s_bdi
  [LogFS] Prevent mempool_destroy NULL pointer dereference
  [LogFS] Move assertion
  [LogFS] Plug 8 byte information leak
  [LogFS] Prevent memory corruption on large deletes
  [LogFS] Remove unused method

Fix trivial conflict with added header includes in fs/logfs/super.c
fs/logfs/gc.c
fs/logfs/journal.c
fs/logfs/readwrite.c
fs/logfs/segment.c
fs/logfs/super.c