GFS2: Some clean up patches
Originally gfs2 had a number of files of the form foo.c and ops_foo.c but over time a number of these have disappeared leaving only one varient or the other. To try and make things uniform (and indeed to match the naming of files in other filesystems) I would like to move towards dropping the ops_foo.c form in favour of the foo.c form.
This set of patches is a first step towards that goal. It also moves some functions which are only called from one place into the same file as they are called from in order to make them static.
Steve.
PATCH 1/5 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.
fs/gfs2/Makefile +1 -1
@@ -1,7 +1,7 @@ obj-$(CONFIG_GFS2_FS) += gfs2.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 \ - 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 \ recovery.o rgrp.o super.o sys.o trans.o util.o
fs/gfs2/aops.c new file +1145 -0
1,145 lines not on this page · raw message
fs/gfs2/bmap.c +0 -1
@@ -25,7 +25,6 @@#include "trans.h" #include "dir.h" #include "util.h" -#include "ops_address.h" /* 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
fs/gfs2/dentry.c new file +114 -0
114 lines not on this page · raw message
fs/gfs2/export.c new file +285 -0
285 lines not on this page · raw message
fs/gfs2/file.c new file +765 -0
765 lines not on this page · raw message
fs/gfs2/inode.c +0 -1
@@ -30,7 +30,6 @@#include "inode.h" #include "log.h" #include "meta_io.h" -#include "ops_address.h" #include "quota.h" #include "rgrp.h" #include "trans.h"
fs/gfs2/inode.h +33 -24
71 lines not on this page · raw message
fs/gfs2/meta_io.c +0 -1
@@ -31,7 +31,6 @@#include "rgrp.h" #include "trans.h" #include "util.h" -#include "ops_address.h" static int gfs2_aspace_writepage (struct page *page,struct writeback_control *wbc) {
fs/gfs2/ops_address.c deleted +0 -1146
591 lines not on this page · raw message
fs/gfs2/ops_dentry.c deleted +0 -114
114 lines not on this page · raw message
fs/gfs2/ops_export.c deleted +0 -285
285 lines not on this page · raw message
fs/gfs2/ops_file.c deleted +0 -766
766 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.6.0.6
Part of the diff is not shown here. View the raw message.
PATCH 2/5 GFS2: Merge mount.c and ops_super.c into super.c
mount.c only contained a single function, so is not really worth retaining on its own. All of the super related code is now either in super.c or ops_fstype.c
fs/gfs2/Makefile +2 -2
@@ -1,8 +1,8 @@ obj-$(CONFIG_GFS2_FS) += gfs2.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 \ - mount.o aops.o dentry.o export.o file.o \ - ops_fstype.o ops_inode.o ops_super.o quota.o \ + aops.o dentry.o export.o file.o \ + ops_fstype.o ops_inode.o quota.o \ recovery.o rgrp.o super.o sys.o trans.o util.o gfs2-$(CONFIG_GFS2_FS_LOCKING_DLM) += lock_dlm.o
fs/gfs2/mount.c deleted +0 -195
195 lines not on this page · raw message
fs/gfs2/ops_super.c deleted +0 -757
757 lines not on this page · raw message
fs/gfs2/super.c +901 -2
924 lines not on this page · raw message
Signature · 1 line
1.6.0.6
PATCH 3/5 GFS2: Move gfs2_rmdiri into ops_inode.c
Move gfs2_rmdiri() into ops_inode.c and make it static.
fs/gfs2/inode.c +0 -52
@@ -1046,58 +1046,6 @@ fail:return ERR_PTR (error); } -/** -* gfs2_rmdiri - Remove a directory -* @dip: The parent directory of the directory to be removed -* @name: The name of the directory to be removed -* @ip: The GFS2 inode of the directory to be removed -* -* Assumes Glocks on dip and ip are held -* -* Returns: errno -*/ - -int gfs2_rmdiri (struct gfs2_inode *dip,const struct qstr *name, -struct gfs2_inode *ip) -{ -struct qstr dotname; -int error; - -if (ip->i_entries !=2 ) { -if (gfs2_consist_inode (ip)) -gfs2_dinode_print (ip); -return -EIO ; - } - - error =gfs2_dir_del (dip, name); -if (error) -return error; - - error =gfs2_change_nlink (dip,-1 ); -if (error) -return error; - -gfs2_str2qstr (&dotname,"." ); - error =gfs2_dir_del (ip, &dotname); -if (error) -return error; - -gfs2_str2qstr (&dotname,".." ); - error =gfs2_dir_del (ip, &dotname); -if (error) -return error; - -/* It looks odd, but it really should be done twice */ - error =gfs2_change_nlink (ip,-1 ); -if (error) -return error; - - error =gfs2_change_nlink (ip,-1 ); -if (error) -return error; - -return error; -}/* * gfs2_unlink_ok - check to see that a inode is still in a directory
fs/gfs2/inode.h +0 -2
@@ -96,8 +96,6 @@ extern struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,extern struct inode *gfs2_createi (struct gfs2_holder *ghs,const struct qstr *name,unsigned int mode,dev_t dev); -extern int gfs2_rmdiri (struct gfs2_inode *dip,const struct qstr *name, -struct gfs2_inode *ip);extern int gfs2_unlink_ok (struct gfs2_inode *dip,const struct qstr *name,const struct gfs2_inode *ip);extern int gfs2_permission (struct inode *inode,int mask);
fs/gfs2/ops_inode.c +53 -0
59 lines not on this page · raw message
Signature · 1 line
1.6.0.6
PATCH 4/5 GFS2: Move gfs2_readlinki into ops_inode.c
Move gfs2_readlinki into ops_inode.c and make it static
fs/gfs2/inode.c +1 -57
@@ -1085,63 +1085,7 @@ int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,return 0 ; } -/** -* gfs2_readlinki - return the contents of a symlink -* @ip: the symlink's inode -* @buf: a pointer to the buffer to be filled -* @len: a pointer to the length of @buf -* -* If @buf is too small, a piece of memory is kmalloc()ed and needs -* to be freed by the caller. -* -* Returns: errno -*/ - -int gfs2_readlinki (struct gfs2_inode *ip,char **buf,unsigned int *len) -{ -struct gfs2_holder i_gh; -struct buffer_head *dibh; -unsigned int x; -int error; - -gfs2_holder_init (ip->i_gl,LM_ST_SHARED ,0 , &i_gh); - error =gfs2_glock_nq (&i_gh); -if (error) { -gfs2_holder_uninit (&i_gh); -return error; - } - -if (!ip->i_disksize) { -gfs2_consist_inode (ip); - error = -EIO ; - goto out; - } - - error =gfs2_meta_inode_buffer (ip, &dibh); -if (error) - goto out; - - x = ip->i_disksize +1 ; -if (x > *len) { - *buf =kmalloc (x,GFP_NOFS ); -if (!*buf) { - error = -ENOMEM ; - goto out_brelse; - } - } - -memcpy (*buf, dibh->b_data +sizeof (struct gfs2_dinode ), x); - *len = x; - -out_brelse: -brelse (dibh); -out: -gfs2_glock_dq_uninit (&i_gh); -return error; -} - -static int -__gfs2_setattr_simple (struct gfs2_inode *ip,struct iattr *attr) +static int __gfs2_setattr_simple (struct gfs2_inode *ip,struct iattr *attr) {struct buffer_head *dibh;int error;
fs/gfs2/inode.h +0 -1
@@ -99,7 +99,6 @@ extern struct inode *gfs2_createi(struct gfs2_holder *ghs,extern int gfs2_unlink_ok (struct gfs2_inode *dip,const struct qstr *name,const struct gfs2_inode *ip);extern int gfs2_permission (struct inode *inode,int mask); -extern int gfs2_readlinki (struct gfs2_inode *ip,char **buf,unsigned int *len);extern int gfs2_setattr_simple (struct gfs2_inode *ip,struct iattr *attr);extern struct inode *gfs2_lookup_simple (struct inode *dip,const char *name);extern void gfs2_dinode_out (const struct gfs2_inode *ip,void *buf);
fs/gfs2/ops_inode.c +55 -0
61 lines not on this page · raw message
Signature · 1 line
1.6.0.6
PATCH 5/5 GFS2: Move gfs2_unlink_ok into ops_inode.c
Another function which is only called from one ops_inode.c so we move it and make it static.
fs/gfs2/inode.c +0 -39
@@ -1046,45 +1046,6 @@ fail:return ERR_PTR (error); } - -/* -* gfs2_unlink_ok - check to see that a inode is still in a directory -* @dip: the directory -* @name: the name of the file -* @ip: the inode -* -* Assumes that the lock on (at least) @dip is held. -* -* Returns: 0 if the parent/child relationship is correct, errno if it isn't -*/ - -int gfs2_unlink_ok (struct gfs2_inode *dip,const struct qstr *name, -const struct gfs2_inode *ip) -{ -int error; - -if (IS_IMMUTABLE (&ip->i_inode) ||IS_APPEND (&ip->i_inode)) -return -EPERM ; - -if ((dip->i_inode.i_mode &S_ISVTX ) && - dip->i_inode.i_uid !=current_fsuid () && - ip->i_inode.i_uid !=current_fsuid () && !capable (CAP_FOWNER )) -return -EPERM ; - -if (IS_APPEND (&dip->i_inode)) -return -EPERM ; - - error =gfs2_permission (&dip->i_inode,MAY_WRITE |MAY_EXEC ); -if (error) -return error; - - error =gfs2_dir_check (&dip->i_inode, name, ip); -if (error) -return error; - -return 0 ; -} -static int __gfs2_setattr_simple (struct gfs2_inode *ip,struct iattr *attr) {struct buffer_head *dibh;
fs/gfs2/inode.h +0 -2
@@ -96,8 +96,6 @@ extern struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,extern struct inode *gfs2_createi (struct gfs2_holder *ghs,const struct qstr *name,unsigned int mode,dev_t dev); -extern int gfs2_unlink_ok (struct gfs2_inode *dip,const struct qstr *name, -const struct gfs2_inode *ip);extern int gfs2_permission (struct inode *inode,int mask);extern int gfs2_setattr_simple (struct gfs2_inode *ip,struct iattr *attr);extern struct inode *gfs2_lookup_simple (struct inode *dip,const char *name);
fs/gfs2/ops_inode.c +38 -0
@@ -262,6 +262,44 @@ out_parent:return error; } +/* +* gfs2_unlink_ok - check to see that a inode is still in a directory +* @dip: the directory +* @name: the name of the file +* @ip: the inode +* +* Assumes that the lock on (at least) @dip is held. +* +* Returns: 0 if the parent/child relationship is correct, errno if it isn't +*/ + +static int gfs2_unlink_ok (struct gfs2_inode *dip,const struct qstr *name, +const struct gfs2_inode *ip) +{ +int error; + +if (IS_IMMUTABLE (&ip->i_inode) ||IS_APPEND (&ip->i_inode)) +return -EPERM ; + +if ((dip->i_inode.i_mode &S_ISVTX ) && + dip->i_inode.i_uid !=current_fsuid () && + ip->i_inode.i_uid !=current_fsuid () && !capable (CAP_FOWNER )) +return -EPERM ; + +if (IS_APPEND (&dip->i_inode)) +return -EPERM ; + + error =gfs2_permission (&dip->i_inode,MAY_WRITE |MAY_EXEC ); +if (error) +return error; + + error =gfs2_dir_check (&dip->i_inode, name, ip); +if (error) +return error; + +return 0 ; +} +/** * gfs2_unlink - Unlink a file * @dir: The inode of the directory containing the file to unlink
Signature · 1 line
1.6.0.6