diff options
author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /fs/efs/super.c | |
parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/efs/super.c')
-rw-r--r-- | fs/efs/super.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/efs/super.c b/fs/efs/super.c index 14082405cdd1..d733531b55e2 100644 --- a/fs/efs/super.c +++ b/fs/efs/super.c | |||
@@ -8,14 +8,15 @@ | |||
8 | 8 | ||
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/efs_fs.h> | ||
12 | #include <linux/efs_vh.h> | ||
13 | #include <linux/efs_fs_sb.h> | ||
14 | #include <linux/exportfs.h> | 11 | #include <linux/exportfs.h> |
15 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
16 | #include <linux/buffer_head.h> | 13 | #include <linux/buffer_head.h> |
17 | #include <linux/vfs.h> | 14 | #include <linux/vfs.h> |
18 | 15 | ||
16 | #include "efs.h" | ||
17 | #include <linux/efs_vh.h> | ||
18 | #include <linux/efs_fs_sb.h> | ||
19 | |||
19 | static int efs_statfs(struct dentry *dentry, struct kstatfs *buf); | 20 | static int efs_statfs(struct dentry *dentry, struct kstatfs *buf); |
20 | static int efs_fill_super(struct super_block *s, void *d, int silent); | 21 | static int efs_fill_super(struct super_block *s, void *d, int silent); |
21 | 22 | ||