diff options
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/inode.c | 1 | ||||
-rw-r--r-- | fs/gfs2/inode.h | 11 | ||||
-rw-r--r-- | fs/gfs2/main.c | 2 | ||||
-rw-r--r-- | fs/gfs2/ops_dentry.c | 2 | ||||
-rw-r--r-- | fs/gfs2/ops_dentry.h | 17 | ||||
-rw-r--r-- | fs/gfs2/ops_export.c | 3 | ||||
-rw-r--r-- | fs/gfs2/ops_file.c | 1 | ||||
-rw-r--r-- | fs/gfs2/ops_fstype.c | 3 | ||||
-rw-r--r-- | fs/gfs2/ops_fstype.h | 19 | ||||
-rw-r--r-- | fs/gfs2/ops_inode.c | 3 | ||||
-rw-r--r-- | fs/gfs2/ops_inode.h | 25 | ||||
-rw-r--r-- | fs/gfs2/ops_super.c | 1 | ||||
-rw-r--r-- | fs/gfs2/ops_super.h | 17 | ||||
-rw-r--r-- | fs/gfs2/super.h | 8 |
14 files changed, 23 insertions, 90 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index d57616840e89..bf4676d7acd5 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include "log.h" | 32 | #include "log.h" |
33 | #include "meta_io.h" | 33 | #include "meta_io.h" |
34 | #include "ops_address.h" | 34 | #include "ops_address.h" |
35 | #include "ops_inode.h" | ||
36 | #include "quota.h" | 35 | #include "quota.h" |
37 | #include "rgrp.h" | 36 | #include "rgrp.h" |
38 | #include "trans.h" | 37 | #include "trans.h" |
diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index 2d43f69610a0..c3577906f0ad 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h | |||
@@ -10,6 +10,7 @@ | |||
10 | #ifndef __INODE_DOT_H__ | 10 | #ifndef __INODE_DOT_H__ |
11 | #define __INODE_DOT_H__ | 11 | #define __INODE_DOT_H__ |
12 | 12 | ||
13 | #include <linux/fs.h> | ||
13 | #include "util.h" | 14 | #include "util.h" |
14 | 15 | ||
15 | static inline int gfs2_is_stuffed(const struct gfs2_inode *ip) | 16 | static inline int gfs2_is_stuffed(const struct gfs2_inode *ip) |
@@ -97,5 +98,15 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name); | |||
97 | void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf); | 98 | void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf); |
98 | void gfs2_dinode_print(const struct gfs2_inode *ip); | 99 | void gfs2_dinode_print(const struct gfs2_inode *ip); |
99 | 100 | ||
101 | extern const struct inode_operations gfs2_file_iops; | ||
102 | extern const struct inode_operations gfs2_dir_iops; | ||
103 | extern const struct inode_operations gfs2_symlink_iops; | ||
104 | extern const struct file_operations gfs2_file_fops; | ||
105 | extern const struct file_operations gfs2_dir_fops; | ||
106 | extern const struct file_operations gfs2_file_fops_nolock; | ||
107 | extern const struct file_operations gfs2_dir_fops_nolock; | ||
108 | |||
109 | extern void gfs2_set_inode_flags(struct inode *inode); | ||
110 | |||
100 | #endif /* __INODE_DOT_H__ */ | 111 | #endif /* __INODE_DOT_H__ */ |
101 | 112 | ||
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index bb2cc303ac29..3eea03c78534 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | #include "gfs2.h" | 20 | #include "gfs2.h" |
21 | #include "incore.h" | 21 | #include "incore.h" |
22 | #include "ops_fstype.h" | 22 | #include "super.h" |
23 | #include "sys.h" | 23 | #include "sys.h" |
24 | #include "util.h" | 24 | #include "util.h" |
25 | #include "glock.h" | 25 | #include "glock.h" |
diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c index 4a5e676b4420..c2ad36330ca3 100644 --- a/fs/gfs2/ops_dentry.c +++ b/fs/gfs2/ops_dentry.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include "incore.h" | 19 | #include "incore.h" |
20 | #include "dir.h" | 20 | #include "dir.h" |
21 | #include "glock.h" | 21 | #include "glock.h" |
22 | #include "ops_dentry.h" | 22 | #include "super.h" |
23 | #include "util.h" | 23 | #include "util.h" |
24 | #include "inode.h" | 24 | #include "inode.h" |
25 | 25 | ||
diff --git a/fs/gfs2/ops_dentry.h b/fs/gfs2/ops_dentry.h deleted file mode 100644 index 5caa3db4d3f5..000000000000 --- a/fs/gfs2/ops_dentry.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. | ||
3 | * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. | ||
4 | * | ||
5 | * This copyrighted material is made available to anyone wishing to use, | ||
6 | * modify, copy, or redistribute it subject to the terms and conditions | ||
7 | * of the GNU General Public License version 2. | ||
8 | */ | ||
9 | |||
10 | #ifndef __OPS_DENTRY_DOT_H__ | ||
11 | #define __OPS_DENTRY_DOT_H__ | ||
12 | |||
13 | #include <linux/dcache.h> | ||
14 | |||
15 | extern struct dentry_operations gfs2_dops; | ||
16 | |||
17 | #endif /* __OPS_DENTRY_DOT_H__ */ | ||
diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c index bbb8c36403a9..3a9b9b438344 100644 --- a/fs/gfs2/ops_export.c +++ b/fs/gfs2/ops_export.c | |||
@@ -22,8 +22,7 @@ | |||
22 | #include "glock.h" | 22 | #include "glock.h" |
23 | #include "glops.h" | 23 | #include "glops.h" |
24 | #include "inode.h" | 24 | #include "inode.h" |
25 | #include "ops_dentry.h" | 25 | #include "super.h" |
26 | #include "ops_fstype.h" | ||
27 | #include "rgrp.h" | 26 | #include "rgrp.h" |
28 | #include "util.h" | 27 | #include "util.h" |
29 | 28 | ||
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 3a747f8e2188..fcfaaefc92fb 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include "util.h" | 39 | #include "util.h" |
40 | #include "eaops.h" | 40 | #include "eaops.h" |
41 | #include "ops_address.h" | 41 | #include "ops_address.h" |
42 | #include "ops_inode.h" | ||
43 | 42 | ||
44 | /** | 43 | /** |
45 | * gfs2_llseek - seek to a location in a file | 44 | * gfs2_llseek - seek to a location in a file |
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index b117fcf2c4f5..ca463a450eb9 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
@@ -27,9 +27,6 @@ | |||
27 | #include "glops.h" | 27 | #include "glops.h" |
28 | #include "inode.h" | 28 | #include "inode.h" |
29 | #include "mount.h" | 29 | #include "mount.h" |
30 | #include "ops_fstype.h" | ||
31 | #include "ops_dentry.h" | ||
32 | #include "ops_super.h" | ||
33 | #include "recovery.h" | 30 | #include "recovery.h" |
34 | #include "rgrp.h" | 31 | #include "rgrp.h" |
35 | #include "super.h" | 32 | #include "super.h" |
diff --git a/fs/gfs2/ops_fstype.h b/fs/gfs2/ops_fstype.h deleted file mode 100644 index da8490511836..000000000000 --- a/fs/gfs2/ops_fstype.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. | ||
3 | * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. | ||
4 | * | ||
5 | * This copyrighted material is made available to anyone wishing to use, | ||
6 | * modify, copy, or redistribute it subject to the terms and conditions | ||
7 | * of the GNU General Public License version 2. | ||
8 | */ | ||
9 | |||
10 | #ifndef __OPS_FSTYPE_DOT_H__ | ||
11 | #define __OPS_FSTYPE_DOT_H__ | ||
12 | |||
13 | #include <linux/fs.h> | ||
14 | |||
15 | extern struct file_system_type gfs2_fs_type; | ||
16 | extern struct file_system_type gfs2meta_fs_type; | ||
17 | extern const struct export_operations gfs2_export_ops; | ||
18 | |||
19 | #endif /* __OPS_FSTYPE_DOT_H__ */ | ||
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 1e24b65e1d23..98440fef01cf 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c | |||
@@ -32,12 +32,11 @@ | |||
32 | #include "glock.h" | 32 | #include "glock.h" |
33 | #include "inode.h" | 33 | #include "inode.h" |
34 | #include "meta_io.h" | 34 | #include "meta_io.h" |
35 | #include "ops_dentry.h" | ||
36 | #include "ops_inode.h" | ||
37 | #include "quota.h" | 35 | #include "quota.h" |
38 | #include "rgrp.h" | 36 | #include "rgrp.h" |
39 | #include "trans.h" | 37 | #include "trans.h" |
40 | #include "util.h" | 38 | #include "util.h" |
39 | #include "super.h" | ||
41 | 40 | ||
42 | /** | 41 | /** |
43 | * gfs2_create - Create a file | 42 | * gfs2_create - Create a file |
diff --git a/fs/gfs2/ops_inode.h b/fs/gfs2/ops_inode.h deleted file mode 100644 index 14b4b797622a..000000000000 --- a/fs/gfs2/ops_inode.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. | ||
3 | * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. | ||
4 | * | ||
5 | * This copyrighted material is made available to anyone wishing to use, | ||
6 | * modify, copy, or redistribute it subject to the terms and conditions | ||
7 | * of the GNU General Public License version 2. | ||
8 | */ | ||
9 | |||
10 | #ifndef __OPS_INODE_DOT_H__ | ||
11 | #define __OPS_INODE_DOT_H__ | ||
12 | |||
13 | #include <linux/fs.h> | ||
14 | |||
15 | extern const struct inode_operations gfs2_file_iops; | ||
16 | extern const struct inode_operations gfs2_dir_iops; | ||
17 | extern const struct inode_operations gfs2_symlink_iops; | ||
18 | extern const struct file_operations gfs2_file_fops; | ||
19 | extern const struct file_operations gfs2_dir_fops; | ||
20 | extern const struct file_operations gfs2_file_fops_nolock; | ||
21 | extern const struct file_operations gfs2_dir_fops_nolock; | ||
22 | |||
23 | extern void gfs2_set_inode_flags(struct inode *inode); | ||
24 | |||
25 | #endif /* __OPS_INODE_DOT_H__ */ | ||
diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c index d5355d9b5926..9c7678db08fb 100644 --- a/fs/gfs2/ops_super.c +++ b/fs/gfs2/ops_super.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include "inode.h" | 28 | #include "inode.h" |
29 | #include "log.h" | 29 | #include "log.h" |
30 | #include "mount.h" | 30 | #include "mount.h" |
31 | #include "ops_super.h" | ||
32 | #include "quota.h" | 31 | #include "quota.h" |
33 | #include "recovery.h" | 32 | #include "recovery.h" |
34 | #include "rgrp.h" | 33 | #include "rgrp.h" |
diff --git a/fs/gfs2/ops_super.h b/fs/gfs2/ops_super.h deleted file mode 100644 index 442a274c6272..000000000000 --- a/fs/gfs2/ops_super.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. | ||
3 | * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. | ||
4 | * | ||
5 | * This copyrighted material is made available to anyone wishing to use, | ||
6 | * modify, copy, or redistribute it subject to the terms and conditions | ||
7 | * of the GNU General Public License version 2. | ||
8 | */ | ||
9 | |||
10 | #ifndef __OPS_SUPER_DOT_H__ | ||
11 | #define __OPS_SUPER_DOT_H__ | ||
12 | |||
13 | #include <linux/fs.h> | ||
14 | |||
15 | extern const struct super_operations gfs2_super_ops; | ||
16 | |||
17 | #endif /* __OPS_SUPER_DOT_H__ */ | ||
diff --git a/fs/gfs2/super.h b/fs/gfs2/super.h index 50a4c9b1215e..1848dad3ecba 100644 --- a/fs/gfs2/super.h +++ b/fs/gfs2/super.h | |||
@@ -10,6 +10,8 @@ | |||
10 | #ifndef __SUPER_DOT_H__ | 10 | #ifndef __SUPER_DOT_H__ |
11 | #define __SUPER_DOT_H__ | 11 | #define __SUPER_DOT_H__ |
12 | 12 | ||
13 | #include <linux/fs.h> | ||
14 | #include <linux/dcache.h> | ||
13 | #include "incore.h" | 15 | #include "incore.h" |
14 | 16 | ||
15 | void gfs2_lm_unmount(struct gfs2_sbd *sdp); | 17 | void gfs2_lm_unmount(struct gfs2_sbd *sdp); |
@@ -46,5 +48,11 @@ int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host *sc); | |||
46 | int gfs2_freeze_fs(struct gfs2_sbd *sdp); | 48 | int gfs2_freeze_fs(struct gfs2_sbd *sdp); |
47 | void gfs2_unfreeze_fs(struct gfs2_sbd *sdp); | 49 | void gfs2_unfreeze_fs(struct gfs2_sbd *sdp); |
48 | 50 | ||
51 | extern struct file_system_type gfs2_fs_type; | ||
52 | extern struct file_system_type gfs2meta_fs_type; | ||
53 | extern const struct export_operations gfs2_export_ops; | ||
54 | extern const struct super_operations gfs2_super_ops; | ||
55 | extern struct dentry_operations gfs2_dops; | ||
56 | |||
49 | #endif /* __SUPER_DOT_H__ */ | 57 | #endif /* __SUPER_DOT_H__ */ |
50 | 58 | ||