kill struct bhv_vnode
PATCH 8/17 kill struct bhv_vnode
Now that struct bhv_vnode is empty we can just kill it. Retain bhv_vattr_t as a typedef for struct inode for the time beeing until all the fallout is cleaned up.
Signed-off-by Christoph Hellwig <[email protected]>
fs/xfs/dmapi/xfs_dm_bhv.c +1 -1
@@ -58,7 +58,7 @@ xfs_dm_mount(struct xfs_mount_args *args, struct cred *cr) { - struct bhv_vnode *rootvp; + bhv_vnode_t *rootvp;struct bhv_vfs *vfsp =bhvtovfs (bhv);int error =0 ;
fs/xfs/quota/xfs_qm_bhv.c +1 -1
@@ -188,7 +188,7 @@ STATIC intxfs_qm_statvfs ( struct bhv_desc *bhv, bhv_statvfs_t *statp, - struct bhv_vnode *vnode) + bhv_vnode_t *vnode) { xfs_mount_t *mp;xfs_inode_t *ip;
fs/xfs/xfs_acl.h +7 -8
@@ -50,7 +50,6 @@ typedef struct xfs_acl {#ifdef CONFIG_XFS_POSIX_ACL struct vattr ; -struct bhv_vnode ;struct xfs_inode ;extern struct kmem_zone *xfs_acl_zone;
@@ -58,14 +57,14 @@ extern struct kmem_zone *xfs_acl_zone; (zone) = kmem_zone_init(sizeof(xfs_acl_t), (name))#define xfs_acl_zone_destroy (zone) kmem_zone_destroy(zone) -extern int xfs_acl_inherit (struct bhv_vnode *,struct bhv_vattr *,xfs_acl_t *); +extern int xfs_acl_inherit (bhv_vnode_t *,struct bhv_vattr *,xfs_acl_t *);extern int xfs_acl_iaccess (struct xfs_inode *,mode_t ,cred_t *); -extern int xfs_acl_vtoacl (struct bhv_vnode *,xfs_acl_t *,xfs_acl_t *); -extern int xfs_acl_vhasacl_access (struct bhv_vnode *); -extern int xfs_acl_vhasacl_default (struct bhv_vnode *); -extern int xfs_acl_vset (struct bhv_vnode *,void *,size_t ,int ); -extern int xfs_acl_vget (struct bhv_vnode *,void *,size_t ,int ); -extern int xfs_acl_vremove (struct bhv_vnode *,int ); +extern int xfs_acl_vtoacl (bhv_vnode_t *,xfs_acl_t *,xfs_acl_t *); +extern int xfs_acl_vhasacl_access (bhv_vnode_t *); +extern int xfs_acl_vhasacl_default (bhv_vnode_t *); +extern int xfs_acl_vset (bhv_vnode_t *,void *,size_t ,int ); +extern int xfs_acl_vget (bhv_vnode_t *,void *,size_t ,int ); +extern int xfs_acl_vremove (bhv_vnode_t *,int );#define _ACL_TYPE_ACCESS 1#define _ACL_TYPE_DEFAULT 2
fs/xfs/xfs_attr.h +6 -7
@@ -36,14 +36,13 @@*========================================================================*/ struct cred ; -struct bhv_vnode ;struct xfs_attr_list_context ; -typedef int (*attrset_t )(struct bhv_vnode *,char *,void *,size_t ,int ); -typedef int (*attrget_t )(struct bhv_vnode *,char *,void *,size_t ,int ); -typedef int (*attrremove_t )(struct bhv_vnode *,char *,int ); -typedef int (*attrexists_t )(struct bhv_vnode *); -typedef int (*attrcapable_t )(struct bhv_vnode *,struct cred *); +typedef int (*attrset_t )(bhv_vnode_t *,char *,void *,size_t ,int ); +typedef int (*attrget_t )(bhv_vnode_t *,char *,void *,size_t ,int ); +typedef int (*attrremove_t )(bhv_vnode_t *,char *,int ); +typedef int (*attrexists_t )(bhv_vnode_t *); +typedef int (*attrcapable_t )(bhv_vnode_t *,struct cred *); typedef struct attrnames { char * attr_name;
@@ -64,7 +63,7 @@ extern struct attrnames attr_trusted;extern struct attrnames *attr_namespaces[ATTR_NAMECOUNT ];extern attrnames_t *attr_lookup_namespace (char *,attrnames_t **,int ); -extern int attr_generic_list (struct bhv_vnode *,void *,size_t ,int ,ssize_t *); +extern int attr_generic_list (bhv_vnode_t *,void *,size_t ,int ,ssize_t *);#define ATTR_DONTFOLLOW 0x0001/* -- unused, from IRIX -- */ #define ATTR_ROOT 0x0002/* use attrs in root (trusted) namespace */
fs/xfs/dmapi/xfs_dm.c +1 -1
@@ -474,7 +474,7 @@ xfs_ip_to_stat( buf->dt_uid = dic->di_uid; buf->dt_gid = dic->di_gid; buf->dt_size =XFS_ISIZE (ip); - buf->dt_dev =new_encode_dev (vp->v_inode.i_sb->s_dev); + buf->dt_dev =new_encode_dev (vp->i_sb->s_dev);vn_atime_to_time_t (vp, &buf->dt_atime); buf->dt_mtime = dic->di_mtime.t_sec; buf->dt_ctime = dic->di_ctime.t_sec;
fs/xfs/linux-2.6/xfs_iops.c +3 -4
@@ -65,9 +65,8 @@ xfs_synchronize_atime( vp =XFS_ITOV_NULL (ip);if (vp) { -struct inode *inode = &vp->v_inode; - ip->i_d.di_atime.t_sec = (__int32_t )inode->i_atime.tv_sec; - ip->i_d.di_atime.t_nsec = (__int32_t )inode->i_atime.tv_nsec; + ip->i_d.di_atime.t_sec = (__int32_t )vp->i_atime.tv_sec; + ip->i_d.di_atime.t_nsec = (__int32_t )vp->i_atime.tv_nsec; } }
@@ -327,7 +326,7 @@ xfs_vn_mknod(if (!error) { error =_ACL_INHERIT (vp, &vattr, default_acl);if (!error) -xfs_iflags_set (XFS_I (&vp->v_inode),XFS_IMODIFIED ); +xfs_iflags_set (XFS_I (vp),XFS_IMODIFIED );else xfs_cleanup_inode (dir, vp, dentry, mode); }
fs/xfs/linux-2.6/xfs_lrw.h +1 -2
@@ -19,7 +19,6 @@#define __XFS_LRW_H__struct bhv_desc ; -struct bhv_vnode ;struct xfs_mount ;struct xfs_iocore ;struct xfs_inode ;
@@ -75,7 +74,7 @@ extern int xfsbdstrat(struct xfs_mount *extern int xfs_bdstrat_cb (struct xfs_buf *);extern int xfs_dev_is_read_only (struct xfs_mount *,char *); -extern int xfs_zero_eof (struct bhv_vnode *,struct xfs_iocore *,xfs_off_t , +extern int xfs_zero_eof (struct inode *,struct xfs_iocore *,xfs_off_t ,xfs_fsize_t );#endif /* __XFS_LRW_H__ */
fs/xfs/linux-2.6/xfs_super.c +1 -1
@@ -787,7 +787,7 @@ xfs_fs_fill_super( void *data, int silent) { -struct bhv_vnode *rootvp; +struct inode *rootvp;struct bhv_vfs *vfsp =vfs_allocate (sb);struct xfs_mount_args *args =xfs_args_allocate (sb, silent);struct kstatfs statvfs;
fs/xfs/linux-2.6/xfs_vfs.c +4 -4
@@ -103,7 +103,7 @@ vfs_mntupdate(int vfs_root (struct bhv_desc *bdp, -struct bhv_vnode **vpp) +bhv_vnode_t **vpp) {struct bhv_desc *next = bdp;
@@ -117,7 +117,7 @@ intvfs_statvfs ( struct bhv_desc *bdp, bhv_statvfs_t *statp, - struct bhv_vnode *vp) + bhv_vnode_t *vp) { struct bhv_desc *next = bdp;
@@ -144,7 +144,7 @@ vfs_sync(int vfs_vget (struct bhv_desc *bdp, -struct bhv_vnode **vpp, +bhv_vnode_t **vpp,struct fid *fidp) {struct bhv_desc *next = bdp;
@@ -199,7 +199,7 @@ vfs_get_inode(void vfs_init_vnode (struct bhv_desc *bdp, -struct bhv_vnode *vp, +bhv_vnode_t *vp,struct xfs_inode *ip,int unlock) {
fs/xfs/linux-2.6/xfs_vfs.h +9 -9
@@ -22,7 +22,7 @@#include "xfs_fs.h" struct bhv_vfs ; -struct bhv_vnode ; +struct inode ;struct fid ;struct cred ;
@@ -124,15 +124,15 @@ typedef int (*vfs_showargs_t)(bhv_desc_ttypedef int (*vfs_unmount_t )(bhv_desc_t *,int ,struct cred *);typedef int (*vfs_mntupdate_t )(bhv_desc_t *,int *,struct xfs_mount_args *); -typedef int (*vfs_root_t )(bhv_desc_t *,struct bhv_vnode **); +typedef int (*vfs_root_t )(bhv_desc_t *,struct inode **);typedef int (*vfs_statvfs_t )(bhv_desc_t *,bhv_statvfs_t *, -struct bhv_vnode *); +struct inode *);typedef int (*vfs_sync_t )(bhv_desc_t *,int ,struct cred *); -typedef int (*vfs_vget_t )(bhv_desc_t *,struct bhv_vnode **,struct fid *); +typedef int (*vfs_vget_t )(bhv_desc_t *,struct inode **,struct fid *);typedef int (*vfs_dmapiops_t )(bhv_desc_t *,caddr_t );typedef int (*vfs_quotactl_t )(bhv_desc_t *,int ,int ,caddr_t );typedef void (*vfs_init_vnode_t )(bhv_desc_t *, -struct bhv_vnode *,struct xfs_inode *,int ); +struct inode *,struct xfs_inode *,int );typedef void (*vfs_force_shutdown_t )(bhv_desc_t *,int ,char *,int );typedef void (*vfs_freeze_t )(bhv_desc_t *);typedef struct inode * (*vfs_get_inode_t )(bhv_desc_t *,xfs_ino_t ,int );
@@ -200,14 +200,14 @@ extern int vfs_parseargs(bhv_desc_t *, cextern int vfs_showargs (bhv_desc_t *,struct seq_file *);extern int vfs_unmount (bhv_desc_t *,int ,struct cred *);extern int vfs_mntupdate (bhv_desc_t *,int *,struct xfs_mount_args *); -extern int vfs_root (bhv_desc_t *,struct bhv_vnode **); -extern int vfs_statvfs (bhv_desc_t *,bhv_statvfs_t *,struct bhv_vnode *); +extern int vfs_root (bhv_desc_t *,struct inode **); +extern int vfs_statvfs (bhv_desc_t *,bhv_statvfs_t *,struct inode *);extern int vfs_sync (bhv_desc_t *,int ,struct cred *); -extern int vfs_vget (bhv_desc_t *,struct bhv_vnode **,struct fid *); +extern int vfs_vget (bhv_desc_t *,struct inode **,struct fid *);extern int vfs_dmapiops (bhv_desc_t *,caddr_t );extern int vfs_quotactl (bhv_desc_t *,int ,int ,caddr_t );extern struct inode *vfs_get_inode (bhv_desc_t *,xfs_ino_t ,int ); -extern void vfs_init_vnode (bhv_desc_t *,struct bhv_vnode *,struct xfs_inode *,int ); +extern void vfs_init_vnode (bhv_desc_t *,struct inode *,struct xfs_inode *,int );extern void vfs_force_shutdown (bhv_desc_t *,int ,char *,int );extern void vfs_freeze (bhv_desc_t *);
fs/xfs/linux-2.6/xfs_vnode.h +22 -26
110 lines not on this page · raw message
fs/xfs/xfs_acl.c +2 -2
@@ -376,11 +376,11 @@ xfs_acl_allow_set(bhv_vattr_t va;int error; -if (vp->v_inode.i_flags & (S_IMMUTABLE |S_APPEND )) +if (vp->i_flags & (S_IMMUTABLE |S_APPEND ))return EPERM ;if (kind == _ACL_TYPE_DEFAULT && !VN_ISDIR (vp))return ENOTDIR ; -if (vp->v_inode.i_sb->s_flags &MS_RDONLY ) +if (vp->i_sb->s_flags &MS_RDONLY )return EROFS ; va.va_mask =XFS_AT_UID ; error =xfs_getattr (ip, &va,0 );
fs/xfs/xfs_inode.h +2 -3
@@ -106,7 +106,6 @@ typedef struct xfs_ifork {#ifdef __KERNEL__struct bhv_desc ; -struct bhv_vnode ;struct cred ;struct ktrace ;struct xfs_buf ;
@@ -257,7 +256,7 @@ typedef struct xfs_inode {struct xfs_inode *i_mprev;/* ptr to prev inode */ struct xfs_mount *i_mount;/* fs mount struct ptr */ struct list_head i_reclaim;/* reclaim list */ -struct bhv_vnode *i_vnode;/* vnode backpointer */ +bhv_vnode_t *i_vnode;/* vnode backpointer */ struct xfs_dquot *i_udquot;/* user dquot */ struct xfs_dquot *i_gdquot;/* group dquot */
@@ -497,7 +496,7 @@ void xfs_ihash_init(struct xfs_mount *)void xfs_ihash_free (struct xfs_mount *);xfs_inode_t *xfs_inode_incore (struct xfs_mount *,xfs_ino_t ,struct xfs_trans *); -void xfs_inode_lock_init (xfs_inode_t *,struct bhv_vnode *); +void xfs_inode_lock_init (xfs_inode_t *,bhv_vnode_t *);int xfs_iget (struct xfs_mount *,struct xfs_trans *,xfs_ino_t ,uint ,uint ,xfs_inode_t **,xfs_daddr_t );void xfs_iput (xfs_inode_t *,uint );
fs/xfs/xfs_mount.h +5 -6
@@ -55,7 +55,6 @@ typedef struct xfs_trans_reservations {struct cred ;struct log ;struct bhv_vfs ; -struct bhv_vnode ;struct xfs_mount_args ;struct xfs_inode ;struct xfs_iocore ;
@@ -78,15 +77,15 @@ extern struct bhv_vfsops xfs_vfsops;* Prototypes and functions for the Data Migration subsystem. */ -typedef int (*xfs_send_data_t )(int ,struct bhv_vnode *, +typedef int (*xfs_send_data_t )(int ,bhv_vnode_t *,xfs_off_t ,size_t ,int ,bhv_vrwlock_t *);typedef int (*xfs_send_mmap_t )(struct vm_area_struct *,uint ); -typedef int (*xfs_send_destroy_t )(struct bhv_vnode *,dm_right_t ); +typedef int (*xfs_send_destroy_t )(bhv_vnode_t *,dm_right_t );typedef int (*xfs_send_namesp_t )(dm_eventtype_t ,struct bhv_vfs *, -struct bhv_vnode *, -dm_right_t ,struct bhv_vnode *,dm_right_t , +bhv_vnode_t *, +dm_right_t ,bhv_vnode_t *,dm_right_t ,char *,char *,mode_t ,int ,int ); -typedef void (*xfs_send_unmount_t )(struct bhv_vfs *,struct bhv_vnode *, +typedef void (*xfs_send_unmount_t )(struct bhv_vfs *,bhv_vnode_t *,dm_right_t ,mode_t ,int ,int ); typedef struct xfs_dmops {
Quoted 3 lines · Christoph Hellwig
Now that struct
bhv_vnodeis empty we can just kill it. Retainbhv_vattr_tas a typedef for struct inode for the time beeing until all the fallout is cleaned up.
I think you mean "retain the bhv_vnode_t as a typedef for struct inode":
fs/xfs/linux-2.6/xfs_vnode.h struct attrlist_cursor_kern; · line 33
Quoted 6 lines
fs/xfs/linux-2.6/xfs_vnode.h +1
-4+typedef struct inode bhv_vnode_t ; -typedef struct bhv_vnode { -struct inode v_inode;/* Linux inode */ -/* inode MUST be last */ -}bhv_vnode_t ;
Cheers,
Dave.
Signature · 3 lines
Dave Chinner Principal Engineer SGI Australian Software Group
Quoted 6 lines · David Chinner
Quoted 3 lines · Christoph Hellwig
Now that struct
bhv_vnodeis empty we can just kill it. Retainbhv_vattr_tas a typedef for struct inode for the time beeing until all the fallout is cleaned up.I think you mean "retain the
bhv_vnode_tas a typedef for struct inode":
Yes, feel free to correct it in the final commit message :)