diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/gfs2/util.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/gfs2/util.c')
| -rw-r--r-- | fs/gfs2/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c index f6a7efa34eb9..53511291fe36 100644 --- a/fs/gfs2/util.c +++ b/fs/gfs2/util.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * of the GNU General Public License version 2. | 7 | * of the GNU General Public License version 2. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/slab.h> | ||
| 11 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
| 12 | #include <linux/completion.h> | 11 | #include <linux/completion.h> |
| 13 | #include <linux/buffer_head.h> | 12 | #include <linux/buffer_head.h> |
| @@ -21,6 +20,7 @@ | |||
| 21 | #include "util.h" | 20 | #include "util.h" |
| 22 | 21 | ||
| 23 | struct kmem_cache *gfs2_glock_cachep __read_mostly; | 22 | struct kmem_cache *gfs2_glock_cachep __read_mostly; |
| 23 | struct kmem_cache *gfs2_glock_aspace_cachep __read_mostly; | ||
| 24 | struct kmem_cache *gfs2_inode_cachep __read_mostly; | 24 | struct kmem_cache *gfs2_inode_cachep __read_mostly; |
| 25 | struct kmem_cache *gfs2_bufdata_cachep __read_mostly; | 25 | struct kmem_cache *gfs2_bufdata_cachep __read_mostly; |
| 26 | struct kmem_cache *gfs2_rgrpd_cachep __read_mostly; | 26 | struct kmem_cache *gfs2_rgrpd_cachep __read_mostly; |