提交 b1e71b06 编写于 作者: S Steven Whitehouse

GFS2: Clean up some file names

This patch renames the ops_*.c files which have no counterpart
without the ops_ prefix in order to shorten the name and make
it more readable. In addition, ops_address.h (which was very
small) is moved into inode.h and inode.h is cleaned up by
adding extern where required.
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
上级 1ce97e56
obj-$(CONFIG_GFS2_FS) += gfs2.o obj-$(CONFIG_GFS2_FS) += gfs2.o
gfs2-y := acl.o bmap.o dir.o eaops.o eattr.o glock.o \ gfs2-y := acl.o bmap.o dir.o eaops.o eattr.o glock.o \
glops.o inode.o log.o lops.o main.o meta_io.o \ glops.o inode.o log.o lops.o main.o meta_io.o \
mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \ mount.o aops.o dentry.o export.o file.o \
ops_fstype.o ops_inode.o ops_super.o quota.o \ ops_fstype.o ops_inode.o ops_super.o quota.o \
recovery.o rgrp.o super.o sys.o trans.o util.o recovery.o rgrp.o super.o sys.o trans.o util.o
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "inode.h" #include "inode.h"
#include "log.h" #include "log.h"
#include "meta_io.h" #include "meta_io.h"
#include "ops_address.h"
#include "quota.h" #include "quota.h"
#include "trans.h" #include "trans.h"
#include "rgrp.h" #include "rgrp.h"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "trans.h" #include "trans.h"
#include "dir.h" #include "dir.h"
#include "util.h" #include "util.h"
#include "ops_address.h"
/* This doesn't need to be that large as max 64 bit pointers in a 4k /* This doesn't need to be that large as max 64 bit pointers in a 4k
* block is 512, so __u16 is fine for that. It saves stack space to * block is 512, so __u16 is fine for that. It saves stack space to
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include "trans.h" #include "trans.h"
#include "util.h" #include "util.h"
#include "eaops.h" #include "eaops.h"
#include "ops_address.h"
/** /**
* gfs2_llseek - seek to a location in a file * gfs2_llseek - seek to a location in a file
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "inode.h" #include "inode.h"
#include "log.h" #include "log.h"
#include "meta_io.h" #include "meta_io.h"
#include "ops_address.h"
#include "quota.h" #include "quota.h"
#include "rgrp.h" #include "rgrp.h"
#include "trans.h" #include "trans.h"
......
...@@ -11,8 +11,16 @@ ...@@ -11,8 +11,16 @@
#define __INODE_DOT_H__ #define __INODE_DOT_H__
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/buffer_head.h>
#include <linux/mm.h>
#include "util.h" #include "util.h"
extern int gfs2_releasepage(struct page *page, gfp_t gfp_mask);
extern int gfs2_internal_read(struct gfs2_inode *ip,
struct file_ra_state *ra_state,
char *buf, loff_t *pos, unsigned size);
extern void gfs2_set_aops(struct inode *inode);
static inline int gfs2_is_stuffed(const struct gfs2_inode *ip) static inline int gfs2_is_stuffed(const struct gfs2_inode *ip)
{ {
return !ip->i_height; return !ip->i_height;
...@@ -73,30 +81,31 @@ static inline void gfs2_inum_out(const struct gfs2_inode *ip, ...@@ -73,30 +81,31 @@ static inline void gfs2_inum_out(const struct gfs2_inode *ip,
} }
void gfs2_set_iop(struct inode *inode); extern void gfs2_set_iop(struct inode *inode);
struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned type, extern struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned type,
u64 no_addr, u64 no_formal_ino, u64 no_addr, u64 no_formal_ino,
int skip_freeing); int skip_freeing);
struct inode *gfs2_ilookup(struct super_block *sb, u64 no_addr); extern struct inode *gfs2_ilookup(struct super_block *sb, u64 no_addr);
int gfs2_inode_refresh(struct gfs2_inode *ip); extern int gfs2_inode_refresh(struct gfs2_inode *ip);
int gfs2_dinode_dealloc(struct gfs2_inode *inode); extern int gfs2_dinode_dealloc(struct gfs2_inode *inode);
int gfs2_change_nlink(struct gfs2_inode *ip, int diff); extern int gfs2_change_nlink(struct gfs2_inode *ip, int diff);
struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, extern struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
int is_root); int is_root);
struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, extern struct inode *gfs2_createi(struct gfs2_holder *ghs,
unsigned int mode, dev_t dev); const struct qstr *name,
int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name, unsigned int mode, dev_t dev);
struct gfs2_inode *ip); extern int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name,
int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name, struct gfs2_inode *ip);
const struct gfs2_inode *ip); extern int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
int gfs2_permission(struct inode *inode, int mask); const struct gfs2_inode *ip);
int gfs2_readlinki(struct gfs2_inode *ip, char **buf, unsigned int *len); extern int gfs2_permission(struct inode *inode, int mask);
int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr); extern int gfs2_readlinki(struct gfs2_inode *ip, char **buf, unsigned int *len);
struct inode *gfs2_lookup_simple(struct inode *dip, const char *name); extern int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr);
void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf); extern struct inode *gfs2_lookup_simple(struct inode *dip, const char *name);
void gfs2_dinode_print(const struct gfs2_inode *ip); extern void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);
extern void gfs2_dinode_print(const struct gfs2_inode *ip);
extern const struct inode_operations gfs2_file_iops; extern const struct inode_operations gfs2_file_iops;
extern const struct inode_operations gfs2_dir_iops; extern const struct inode_operations gfs2_dir_iops;
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "rgrp.h" #include "rgrp.h"
#include "trans.h" #include "trans.h"
#include "util.h" #include "util.h"
#include "ops_address.h"
static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wbc) static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wbc)
{ {
......
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
* Copyright (C) 2004-2007 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_ADDRESS_DOT_H__
#define __OPS_ADDRESS_DOT_H__
#include <linux/fs.h>
#include <linux/buffer_head.h>
#include <linux/mm.h>
extern int gfs2_releasepage(struct page *page, gfp_t gfp_mask);
extern int gfs2_internal_read(struct gfs2_inode *ip,
struct file_ra_state *ra_state,
char *buf, loff_t *pos, unsigned size);
extern void gfs2_set_aops(struct inode *inode);
#endif /* __OPS_ADDRESS_DOT_H__ */
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
#include "super.h" #include "super.h"
#include "trans.h" #include "trans.h"
#include "inode.h" #include "inode.h"
#include "ops_address.h"
#include "util.h" #include "util.h"
#define QUOTA_USER 1 #define QUOTA_USER 1
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "util.h" #include "util.h"
#include "log.h" #include "log.h"
#include "inode.h" #include "inode.h"
#include "ops_address.h"
#define BFITNOENT ((u32)~0) #define BFITNOENT ((u32)~0)
#define NO_BLOCK ((u64)~0) #define NO_BLOCK ((u64)~0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册