summaryrefslogtreecommitdiffstats
path: root/fs/ceph/buffer.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2010-05-18 01:30:58 +0200
committerDan Williams <dan.j.williams@intel.com>2010-05-18 01:30:58 +0200
commit0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch)
treefcf504879883763557e696eff81427b1ab78f76b /fs/ceph/buffer.c
parentDMAENGINE: extend the control command to include an arg (diff)
parentasync_tx: trim dma_async_tx_descriptor in 'no channel switch' case (diff)
downloadlinux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.xz
linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.zip
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'fs/ceph/buffer.c')
-rw-r--r--fs/ceph/buffer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ceph/buffer.c b/fs/ceph/buffer.c
index b98086c7aeba..c67535d70aa6 100644
--- a/fs/ceph/buffer.c
+++ b/fs/ceph/buffer.c
@@ -1,5 +1,8 @@
#include "ceph_debug.h"
+
+#include <linux/slab.h>
+
#include "buffer.h"
#include "decode.h"