Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b276058371f5c2ad92f9f27373a72b219ed580ed

Authored by Steven Whitehouse
1 parent e9079cce20

GFS2: Rationalise header files 

Move the contents of some headers which contained very
little into more sensible places, and remove the original
header files. This should make it easier to find things.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Showing 14 changed files with 23 additions and 90 deletions Side-by-side Diff

... ... @@ -32,7 +32,6 @@
32 32 #include "log.h"
33 33 #include "meta_io.h"
34 34 #include "ops_address.h"
35   -#include "ops_inode.h"
36 35 #include "quota.h"
37 36 #include "rgrp.h"
38 37 #include "trans.h"
... ... @@ -10,6 +10,7 @@
10 10 #ifndef __INODE_DOT_H__
11 11 #define __INODE_DOT_H__
12 12  
  13 +#include <linux/fs.h>
13 14 #include "util.h"
14 15  
15 16 static inline int gfs2_is_stuffed(const struct gfs2_inode *ip)
... ... @@ -96,6 +97,16 @@
96 97 struct inode *gfs2_lookup_simple(struct inode *dip, const char *name);
97 98 void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);
98 99 void gfs2_dinode_print(const struct gfs2_inode *ip);
  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);
99 110  
100 111 #endif /* __INODE_DOT_H__ */
... ... @@ -19,7 +19,7 @@
19 19  
20 20 #include "gfs2.h"
21 21 #include "incore.h"
22   -#include "ops_fstype.h"
  22 +#include "super.h"
23 23 #include "sys.h"
24 24 #include "util.h"
25 25 #include "glock.h"
fs/gfs2/ops_dentry.c
Diff comments   View file @ b276058
... ... @@ -19,7 +19,7 @@
19 19 #include "incore.h"
20 20 #include "dir.h"
21 21 #include "glock.h"
22   -#include "ops_dentry.h"
  22 +#include "super.h"
23 23 #include "util.h"
24 24 #include "inode.h"
25 25  
fs/gfs2/ops_dentry.h
View file @ b276058
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__ */
fs/gfs2/ops_export.c
Diff comments   View file @ b276058
... ... @@ -22,8 +22,7 @@
22 22 #include "glock.h"
23 23 #include "glops.h"
24 24 #include "inode.h"
25   -#include "ops_dentry.h"
26   -#include "ops_fstype.h"
  25 +#include "super.h"
27 26 #include "rgrp.h"
28 27 #include "util.h"
29 28  
... ... @@ -39,7 +39,6 @@
39 39 #include "util.h"
40 40 #include "eaops.h"
41 41 #include "ops_address.h"
42   -#include "ops_inode.h"
43 42  
44 43 /**
45 44 * gfs2_llseek - seek to a location in a file
fs/gfs2/ops_fstype.c
Diff comments   View file @ b276058
... ... @@ -27,9 +27,6 @@
27 27 #include "glops.h"
28 28 #include "inode.h"
29 29 #include "mount.h"
30   -#include "ops_fstype.h"
31   -#include "ops_dentry.h"
32   -#include "ops_super.h"
33 30 #include "recovery.h"
34 31 #include "rgrp.h"
35 32 #include "super.h"
fs/gfs2/ops_fstype.h
View file @ b276058
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__ */
... ... @@ -32,12 +32,11 @@
32 32 #include "glock.h"
33 33 #include "inode.h"
34 34 #include "meta_io.h"
35   -#include "ops_dentry.h"
36   -#include "ops_inode.h"
37 35 #include "quota.h"
38 36 #include "rgrp.h"
39 37 #include "trans.h"
40 38 #include "util.h"
  39 +#include "super.h"
41 40  
42 41 /**
43 42 * gfs2_create - Create a file
fs/gfs2/ops_inode.h
View file @ b276058
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__ */
... ... @@ -28,7 +28,6 @@
28 28 #include "inode.h"
29 29 #include "log.h"
30 30 #include "mount.h"
31   -#include "ops_super.h"
32 31 #include "quota.h"
33 32 #include "recovery.h"
34 33 #include "rgrp.h"
fs/gfs2/ops_super.h
View file @ b276058
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__ */
... ... @@ -10,6 +10,8 @@
10 10 #ifndef __SUPER_DOT_H__
11 11 #define __SUPER_DOT_H__
12 12  
  13 +#include <linux/fs.h>
  14 +#include <linux/dcache.h>
13 15 #include "incore.h"
14 16  
15 17 void gfs2_lm_unmount(struct gfs2_sbd *sdp);
... ... @@ -45,6 +47,12 @@
45 47  
46 48 int gfs2_freeze_fs(struct gfs2_sbd *sdp);
47 49 void gfs2_unfreeze_fs(struct gfs2_sbd *sdp);
  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;
48 56  
49 57 #endif /* __SUPER_DOT_H__ */