Commit b2760583 authored by Steven Whitehouse's avatar Steven Whitehouse

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: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent e9079cce
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "log.h" #include "log.h"
#include "meta_io.h" #include "meta_io.h"
#include "ops_address.h" #include "ops_address.h"
#include "ops_inode.h"
#include "quota.h" #include "quota.h"
#include "rgrp.h" #include "rgrp.h"
#include "trans.h" #include "trans.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#ifndef __INODE_DOT_H__ #ifndef __INODE_DOT_H__
#define __INODE_DOT_H__ #define __INODE_DOT_H__
#include <linux/fs.h>
#include "util.h" #include "util.h"
static inline int gfs2_is_stuffed(const struct gfs2_inode *ip) 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,5 +98,15 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name);
void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf); void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);
void gfs2_dinode_print(const struct gfs2_inode *ip); void gfs2_dinode_print(const struct gfs2_inode *ip);
extern const struct inode_operations gfs2_file_iops;
extern const struct inode_operations gfs2_dir_iops;
extern const struct inode_operations gfs2_symlink_iops;
extern const struct file_operations gfs2_file_fops;
extern const struct file_operations gfs2_dir_fops;
extern const struct file_operations gfs2_file_fops_nolock;
extern const struct file_operations gfs2_dir_fops_nolock;
extern void gfs2_set_inode_flags(struct inode *inode);
#endif /* __INODE_DOT_H__ */ #endif /* __INODE_DOT_H__ */
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "gfs2.h" #include "gfs2.h"
#include "incore.h" #include "incore.h"
#include "ops_fstype.h" #include "super.h"
#include "sys.h" #include "sys.h"
#include "util.h" #include "util.h"
#include "glock.h" #include "glock.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "incore.h" #include "incore.h"
#include "dir.h" #include "dir.h"
#include "glock.h" #include "glock.h"
#include "ops_dentry.h" #include "super.h"
#include "util.h" #include "util.h"
#include "inode.h" #include "inode.h"
......
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License version 2.
*/
#ifndef __OPS_DENTRY_DOT_H__
#define __OPS_DENTRY_DOT_H__
#include <linux/dcache.h>
extern struct dentry_operations gfs2_dops;
#endif /* __OPS_DENTRY_DOT_H__ */
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
#include "glock.h" #include "glock.h"
#include "glops.h" #include "glops.h"
#include "inode.h" #include "inode.h"
#include "ops_dentry.h" #include "super.h"
#include "ops_fstype.h"
#include "rgrp.h" #include "rgrp.h"
#include "util.h" #include "util.h"
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include "util.h" #include "util.h"
#include "eaops.h" #include "eaops.h"
#include "ops_address.h" #include "ops_address.h"
#include "ops_inode.h"
/** /**
* gfs2_llseek - seek to a location in a file * gfs2_llseek - seek to a location in a file
......
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
#include "glops.h" #include "glops.h"
#include "inode.h" #include "inode.h"
#include "mount.h" #include "mount.h"
#include "ops_fstype.h"
#include "ops_dentry.h"
#include "ops_super.h"
#include "recovery.h" #include "recovery.h"
#include "rgrp.h" #include "rgrp.h"
#include "super.h" #include "super.h"
......
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License version 2.
*/
#ifndef __OPS_FSTYPE_DOT_H__
#define __OPS_FSTYPE_DOT_H__
#include <linux/fs.h>
extern struct file_system_type gfs2_fs_type;
extern struct file_system_type gfs2meta_fs_type;
extern const struct export_operations gfs2_export_ops;
#endif /* __OPS_FSTYPE_DOT_H__ */
...@@ -32,12 +32,11 @@ ...@@ -32,12 +32,11 @@
#include "glock.h" #include "glock.h"
#include "inode.h" #include "inode.h"
#include "meta_io.h" #include "meta_io.h"
#include "ops_dentry.h"
#include "ops_inode.h"
#include "quota.h" #include "quota.h"
#include "rgrp.h" #include "rgrp.h"
#include "trans.h" #include "trans.h"
#include "util.h" #include "util.h"
#include "super.h"
/** /**
* gfs2_create - Create a file * gfs2_create - Create a file
......
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License version 2.
*/
#ifndef __OPS_INODE_DOT_H__
#define __OPS_INODE_DOT_H__
#include <linux/fs.h>
extern const struct inode_operations gfs2_file_iops;
extern const struct inode_operations gfs2_dir_iops;
extern const struct inode_operations gfs2_symlink_iops;
extern const struct file_operations gfs2_file_fops;
extern const struct file_operations gfs2_dir_fops;
extern const struct file_operations gfs2_file_fops_nolock;
extern const struct file_operations gfs2_dir_fops_nolock;
extern void gfs2_set_inode_flags(struct inode *inode);
#endif /* __OPS_INODE_DOT_H__ */
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "inode.h" #include "inode.h"
#include "log.h" #include "log.h"
#include "mount.h" #include "mount.h"
#include "ops_super.h"
#include "quota.h" #include "quota.h"
#include "recovery.h" #include "recovery.h"
#include "rgrp.h" #include "rgrp.h"
......
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License version 2.
*/
#ifndef __OPS_SUPER_DOT_H__
#define __OPS_SUPER_DOT_H__
#include <linux/fs.h>
extern const struct super_operations gfs2_super_ops;
#endif /* __OPS_SUPER_DOT_H__ */
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#ifndef __SUPER_DOT_H__ #ifndef __SUPER_DOT_H__
#define __SUPER_DOT_H__ #define __SUPER_DOT_H__
#include <linux/fs.h>
#include <linux/dcache.h>
#include "incore.h" #include "incore.h"
void gfs2_lm_unmount(struct gfs2_sbd *sdp); 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,5 +48,11 @@ int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host *sc);
int gfs2_freeze_fs(struct gfs2_sbd *sdp); int gfs2_freeze_fs(struct gfs2_sbd *sdp);
void gfs2_unfreeze_fs(struct gfs2_sbd *sdp); void gfs2_unfreeze_fs(struct gfs2_sbd *sdp);
extern struct file_system_type gfs2_fs_type;
extern struct file_system_type gfs2meta_fs_type;
extern const struct export_operations gfs2_export_ops;
extern const struct super_operations gfs2_super_ops;
extern struct dentry_operations gfs2_dops;
#endif /* __SUPER_DOT_H__ */ #endif /* __SUPER_DOT_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment