From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Apr 2010 19:31:12 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
X-Git-Tag: Ubuntu-5.0.0-8.9~23414
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=255f41c59558a346d65a2012420a7573e36dc584;p=mirror_ubuntu-disco-kernel.git

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
---

255f41c59558a346d65a2012420a7573e36dc584
diff --cc fs/logfs/super.c
index b60bfac3263c,dacce3a917ae..5866ee6e1327
--- a/fs/logfs/super.c
+++ b/fs/logfs/super.c
@@@ -11,7 -11,7 +11,8 @@@
   */
  #include "logfs.h"
  #include <linux/bio.h>
 +#include <linux/slab.h>
+ #include <linux/blkdev.h>
  #include <linux/mtd/mtd.h>
  #include <linux/statfs.h>
  #include <linux/buffer_head.h>