From 73bbcd971df75678f3a4a89792b593ef5de66a60 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 20 Apr 2010 15:20:33 -0700
Subject: [PATCH] --- yaml --- r: 190527 b: refs/heads/master c:
 d45d0d970f495e04a4e4f46acd74e90f4a4564f9 h: refs/heads/master i:   190525:
 2a939c17281ec85a380fb2e6c4d60fba7ec4f63f   190523:
 3cc0d8ad026192b26fb9224845c502f7eb51f8d6   190519:
 5e731ea299d6ad11686405c35d51f9f6b62d13be   190511:
 050f4168083cdedbb0cdfee743e0ab300161a6d4   190495:
 33b36c991096c1240f83c1399356fa99c862a398   190463:
 9fa46ead279b0cead98ffc3098f502d385d3d08a v: v3

---
 [refs]                    | 2 +-
 trunk/fs/ceph/auth.c      | 1 +
 trunk/fs/ceph/auth_none.h | 2 ++
 trunk/fs/ceph/super.h     | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index af06600daaa6..7f5fba7e80e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b0c06d1476290cea248923c0ee7be9fd61cacea
+refs/heads/master: d45d0d970f495e04a4e4f46acd74e90f4a4564f9
diff --git a/trunk/fs/ceph/auth.c b/trunk/fs/ceph/auth.c
index f6394b94b866..818afe72e6c7 100644
--- a/trunk/fs/ceph/auth.c
+++ b/trunk/fs/ceph/auth.c
@@ -3,6 +3,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 #include "types.h"
 #include "auth_none.h"
diff --git a/trunk/fs/ceph/auth_none.h b/trunk/fs/ceph/auth_none.h
index 56c05533a31c..8164df1a08be 100644
--- a/trunk/fs/ceph/auth_none.h
+++ b/trunk/fs/ceph/auth_none.h
@@ -1,6 +1,8 @@
 #ifndef _FS_CEPH_AUTH_NONE_H
 #define _FS_CEPH_AUTH_NONE_H
 
+#include <linux/slab.h>
+
 #include "auth.h"
 
 /*
diff --git a/trunk/fs/ceph/super.h b/trunk/fs/ceph/super.h
index e30dfbb056c3..13513b80d87f 100644
--- a/trunk/fs/ceph/super.h
+++ b/trunk/fs/ceph/super.h
@@ -10,6 +10,7 @@
 #include <linux/fs.h>
 #include <linux/mempool.h>
 #include <linux/pagemap.h>
+#include <linux/slab.h>
 #include <linux/wait.h>
 #include <linux/writeback.h>
 #include <linux/slab.h>