diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 13:37:29 -0700 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 13:37:29 -0700 |
| commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
| tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /fs/affs | |
| parent | a36d515c7a2dfacebcf41729f6812dbc424ebcf0 (diff) | |
| parent | a9743fcdc0eb43d028b71267438076e1b0112ba0 (diff) | |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/bitmap.c | 1 | ||||
| -rw-r--r-- | fs/affs/inode.c | 1 | ||||
| -rw-r--r-- | fs/affs/super.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c index 8306d53307e..3e262711ae0 100644 --- a/fs/affs/bitmap.c +++ b/fs/affs/bitmap.c @@ -7,6 +7,7 @@ * block allocation, deallocation, calculation of free space. */ +#include <linux/slab.h> #include "affs.h" /* This is, of course, shamelessly stolen from fs/minix */ diff --git a/fs/affs/inode.c b/fs/affs/inode.c index c9744d771d9..f4b2a4ee4f9 100644 --- a/fs/affs/inode.c +++ b/fs/affs/inode.c @@ -10,6 +10,7 @@ * (C) 1991 Linus Torvalds - minix filesystem */ #include <linux/sched.h> +#include <linux/gfp.h> #include "affs.h" extern const struct inode_operations affs_symlink_inode_operations; diff --git a/fs/affs/super.c b/fs/affs/super.c index d41e9673cd9..16a3e4765f6 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -17,6 +17,7 @@ #include <linux/magic.h> #include <linux/sched.h> #include <linux/smp_lock.h> +#include <linux/slab.h> #include "affs.h" extern struct timezone sys_tz; |