UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[XFS] kill bhv_vnode_t 

All remaining bhv_vnode_t instance are in code that's more or less Linux
specific. (Well, for xfs_acl.c that could be argued, but that code is on
the removal list, too). So just do an s/bhv_vnode_t/struct inode/ over the
whole tree. We can clean up variable naming and some useless helpers
later.

SGI-PV: 981498

SGI-Modid: xfs-linux-melb:xfs-kern:31781a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Christoph Hellwig 2008-08-13 16:22:40 +10:00 committed by Lachlan McIlroy
parent df80c933f9
commit 5ec7f8c7d1
11 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/linux-2.6/xfs_super.c
View File

@ -2038,7 +2038,7 @@ xfs_free_trace_bufs(void)
STATIC int __init STATIC int __init
xfs_init_zones(void) xfs_init_zones(void)
{ {
xfs_vnode_zone = kmem_zone_init_flags(sizeof(bhv_vnode_t), "xfs_vnode", xfs_vnode_zone = kmem_zone_init_flags(sizeof(struct inode), "xfs_vnode",
KM_ZONE_HWALIGN | KM_ZONE_RECLAIM | KM_ZONE_HWALIGN | KM_ZONE_RECLAIM |
KM_ZONE_SPREAD, KM_ZONE_SPREAD,
xfs_fs_inode_init_once); xfs_fs_inode_init_once);

2
fs/xfs/linux-2.6/xfs_super.h
View File

@ -101,7 +101,7 @@ struct block_device;
extern __uint64_t xfs_max_file_offset(unsigned int); extern __uint64_t xfs_max_file_offset(unsigned int);
extern void xfs_initialize_vnode(struct xfs_mount *mp, bhv_vnode_t *vp, extern void xfs_initialize_vnode(struct xfs_mount *mp, struct inode *vp,
struct xfs_inode *ip); struct xfs_inode *ip);
extern void xfs_flush_inode(struct xfs_inode *); extern void xfs_flush_inode(struct xfs_inode *);

2
fs/xfs/linux-2.6/xfs_vnode.c
View File

@ -90,7 +90,7 @@ vn_ioerror(
*/ */
static inline int xfs_icount(struct xfs_inode *ip) static inline int xfs_icount(struct xfs_inode *ip)
{ {
bhv_vnode_t *vp = VFS_I(ip); struct inode *vp = VFS_I(ip);
if (vp) if (vp)
return vn_count(vp); return vn_count(vp);

14
fs/xfs/linux-2.6/xfs_vnode.h
View File

@ -22,8 +22,6 @@ struct file;
struct xfs_iomap; struct xfs_iomap;
struct attrlist_cursor_kern; struct attrlist_cursor_kern;
typedef struct inode bhv_vnode_t;
/* /*
* Return values for xfs_inactive. A return value of * Return values for xfs_inactive. A return value of
* VN_INACTIVE_NOCACHE implies that the file system behavior * VN_INACTIVE_NOCACHE implies that the file system behavior
@ -64,7 +62,7 @@ extern void vn_iowait(struct xfs_inode *ip);
extern void vn_iowake(struct xfs_inode *ip); extern void vn_iowake(struct xfs_inode *ip);
extern void vn_ioerror(struct xfs_inode *ip, int error, char *f, int l); extern void vn_ioerror(struct xfs_inode *ip, int error, char *f, int l);
static inline int vn_count(bhv_vnode_t *vp) static inline int vn_count(struct inode *vp)
{ {
return atomic_read(&vp->i_count); return atomic_read(&vp->i_count);
} }
@ -82,7 +80,7 @@ do { \
iput(VFS_I(ip)); \ iput(VFS_I(ip)); \
} while (0) } while (0)
static inline bhv_vnode_t *vn_grab(bhv_vnode_t *vp) static inline struct inode *vn_grab(struct inode *vp)
{ {
return igrab(vp); return igrab(vp);
} }
@ -90,7 +88,7 @@ static inline bhv_vnode_t *vn_grab(bhv_vnode_t *vp)
/* /*
* Dealing with bad inodes * Dealing with bad inodes
*/ */
static inline int VN_BAD(bhv_vnode_t *vp) static inline int VN_BAD(struct inode *vp)
{ {
return is_bad_inode(vp); return is_bad_inode(vp);
} }
@ -98,18 +96,18 @@ static inline int VN_BAD(bhv_vnode_t *vp)
/* /*
* Extracting atime values in various formats * Extracting atime values in various formats
*/ */
static inline void vn_atime_to_bstime(bhv_vnode_t *vp, xfs_bstime_t *bs_atime) static inline void vn_atime_to_bstime(struct inode *vp, xfs_bstime_t *bs_atime)
{ {
bs_atime->tv_sec = vp->i_atime.tv_sec; bs_atime->tv_sec = vp->i_atime.tv_sec;
bs_atime->tv_nsec = vp->i_atime.tv_nsec; bs_atime->tv_nsec = vp->i_atime.tv_nsec;
} }
static inline void vn_atime_to_timespec(bhv_vnode_t *vp, struct timespec *ts) static inline void vn_atime_to_timespec(struct inode *vp, struct timespec *ts)
{ {
*ts = vp->i_atime; *ts = vp->i_atime;
} }
static inline void vn_atime_to_time_t(bhv_vnode_t *vp, time_t *tt) static inline void vn_atime_to_time_t(struct inode *vp, time_t *tt)
{ {
*tt = vp->i_atime.tv_sec; *tt = vp->i_atime.tv_sec;
} }

2
fs/xfs/quota/xfs_qm_syscalls.c
View File

@ -1034,7 +1034,7 @@ xfs_qm_dqrele_all_inodes(
{ {
xfs_inode_t *ip, *topino; xfs_inode_t *ip, *topino;
uint ireclaims; uint ireclaims;
bhv_vnode_t *vp; struct inode *vp;
boolean_t vnode_refd; boolean_t vnode_refd;
ASSERT(mp->m_quotainfo); ASSERT(mp->m_quotainfo);

30
fs/xfs/xfs_acl.c
View File

@ -37,15 +37,15 @@
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/posix_acl_xattr.h> #include <linux/posix_acl_xattr.h>
STATIC int xfs_acl_setmode(bhv_vnode_t *, xfs_acl_t *, int *); STATIC int xfs_acl_setmode(struct inode *, xfs_acl_t *, int *);
STATIC void xfs_acl_filter_mode(mode_t, xfs_acl_t *); STATIC void xfs_acl_filter_mode(mode_t, xfs_acl_t *);
STATIC void xfs_acl_get_endian(xfs_acl_t *); STATIC void xfs_acl_get_endian(xfs_acl_t *);
STATIC int xfs_acl_access(uid_t, gid_t, xfs_acl_t *, mode_t, cred_t *); STATIC int xfs_acl_access(uid_t, gid_t, xfs_acl_t *, mode_t, cred_t *);
STATIC int xfs_acl_invalid(xfs_acl_t *); STATIC int xfs_acl_invalid(xfs_acl_t *);
STATIC void xfs_acl_sync_mode(mode_t, xfs_acl_t *); STATIC void xfs_acl_sync_mode(mode_t, xfs_acl_t *);
STATIC void xfs_acl_get_attr(bhv_vnode_t *, xfs_acl_t *, int, int, int *); STATIC void xfs_acl_get_attr(struct inode *, xfs_acl_t *, int, int, int *);
STATIC void xfs_acl_set_attr(bhv_vnode_t *, xfs_acl_t *, int, int *); STATIC void xfs_acl_set_attr(struct inode *, xfs_acl_t *, int, int *);
STATIC int xfs_acl_allow_set(bhv_vnode_t *, int); STATIC int xfs_acl_allow_set(struct inode *, int);
kmem_zone_t *xfs_acl_zone; kmem_zone_t *xfs_acl_zone;
@ -55,7 +55,7 @@ kmem_zone_t *xfs_acl_zone;
*/ */
int int
xfs_acl_vhasacl_access( xfs_acl_vhasacl_access(
bhv_vnode_t *vp) struct inode *vp)
{ {
int error; int error;
@ -68,7 +68,7 @@ xfs_acl_vhasacl_access(
*/ */
int int
xfs_acl_vhasacl_default( xfs_acl_vhasacl_default(
bhv_vnode_t *vp) struct inode *vp)
{ {
int error; int error;
@ -207,7 +207,7 @@ posix_acl_xfs_to_xattr(
int int
xfs_acl_vget( xfs_acl_vget(
bhv_vnode_t *vp, struct inode *vp,
void *acl, void *acl,
size_t size, size_t size,
int kind) int kind)
@ -249,7 +249,7 @@ out:
int int
xfs_acl_vremove( xfs_acl_vremove(
bhv_vnode_t *vp, struct inode *vp,
int kind) int kind)
{ {
int error; int error;
@ -268,7 +268,7 @@ xfs_acl_vremove(
int int
xfs_acl_vset( xfs_acl_vset(
bhv_vnode_t *vp, struct inode *vp,
void *acl, void *acl,
size_t size, size_t size,
int kind) int kind)
@ -357,7 +357,7 @@ xfs_acl_iaccess(
STATIC int STATIC int
xfs_acl_allow_set( xfs_acl_allow_set(
bhv_vnode_t *vp, struct inode *vp,
int kind) int kind)
{ {
if (vp->i_flags & (S_IMMUTABLE|S_APPEND)) if (vp->i_flags & (S_IMMUTABLE|S_APPEND))
@ -560,7 +560,7 @@ xfs_acl_get_endian(
*/ */
STATIC void STATIC void
xfs_acl_get_attr( xfs_acl_get_attr(
bhv_vnode_t *vp, struct inode *vp,
xfs_acl_t *aclp, xfs_acl_t *aclp,
int kind, int kind,
int flags, int flags,
@ -584,7 +584,7 @@ xfs_acl_get_attr(
*/ */
STATIC void STATIC void
xfs_acl_set_attr( xfs_acl_set_attr(
bhv_vnode_t *vp, struct inode *vp,
xfs_acl_t *aclp, xfs_acl_t *aclp,
int kind, int kind,
int *error) int *error)
@ -618,7 +618,7 @@ xfs_acl_set_attr(
int int
xfs_acl_vtoacl( xfs_acl_vtoacl(
bhv_vnode_t *vp, struct inode *vp,
xfs_acl_t *access_acl, xfs_acl_t *access_acl,
xfs_acl_t *default_acl) xfs_acl_t *default_acl)
{ {
@ -650,7 +650,7 @@ xfs_acl_vtoacl(
*/ */
int int
xfs_acl_inherit( xfs_acl_inherit(
bhv_vnode_t *vp, struct inode *vp,
mode_t mode, mode_t mode,
xfs_acl_t *pdaclp) xfs_acl_t *pdaclp)
{ {
@ -709,7 +709,7 @@ out_error:
*/ */
STATIC int STATIC int
xfs_acl_setmode( xfs_acl_setmode(
bhv_vnode_t *vp, struct inode *vp,
xfs_acl_t *acl, xfs_acl_t *acl,
int *basicperms) int *basicperms)
{ {

14
fs/xfs/xfs_acl.h
View File

@ -59,14 +59,14 @@ extern struct kmem_zone *xfs_acl_zone;
(zone) = kmem_zone_init(sizeof(xfs_acl_t), (name)) (zone) = kmem_zone_init(sizeof(xfs_acl_t), (name))
#define xfs_acl_zone_destroy(zone) kmem_zone_destroy(zone) #define xfs_acl_zone_destroy(zone) kmem_zone_destroy(zone)
extern int xfs_acl_inherit(bhv_vnode_t *, mode_t mode, xfs_acl_t *); extern int xfs_acl_inherit(struct inode *, mode_t mode, xfs_acl_t *);
extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *); extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *);
extern int xfs_acl_vtoacl(bhv_vnode_t *, xfs_acl_t *, xfs_acl_t *); extern int xfs_acl_vtoacl(struct inode *, xfs_acl_t *, xfs_acl_t *);
extern int xfs_acl_vhasacl_access(bhv_vnode_t *); extern int xfs_acl_vhasacl_access(struct inode *);
extern int xfs_acl_vhasacl_default(bhv_vnode_t *); extern int xfs_acl_vhasacl_default(struct inode *);
extern int xfs_acl_vset(bhv_vnode_t *, void *, size_t, int); extern int xfs_acl_vset(struct inode *, void *, size_t, int);
extern int xfs_acl_vget(bhv_vnode_t *, void *, size_t, int); extern int xfs_acl_vget(struct inode *, void *, size_t, int);
extern int xfs_acl_vremove(bhv_vnode_t *, int); extern int xfs_acl_vremove(struct inode *, int);
#define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE)) #define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE))

2
fs/xfs/xfs_inode.c
View File

@ -1046,7 +1046,7 @@ xfs_ialloc(
{ {
xfs_ino_t ino; xfs_ino_t ino;
xfs_inode_t *ip; xfs_inode_t *ip;
bhv_vnode_t *vp; struct inode *vp;
uint flags; uint flags;
int error; int error;

2
fs/xfs/xfs_inode.h
View File

@ -204,7 +204,7 @@ typedef struct xfs_inode {
struct xfs_inode *i_mprev; /* ptr to prev inode */ struct xfs_inode *i_mprev; /* ptr to prev inode */
struct xfs_mount *i_mount; /* fs mount struct ptr */ struct xfs_mount *i_mount; /* fs mount struct ptr */
struct list_head i_reclaim; /* reclaim list */ struct list_head i_reclaim; /* reclaim list */
bhv_vnode_t *i_vnode; /* vnode backpointer */ struct inode *i_vnode; /* vnode backpointer */
struct xfs_dquot *i_udquot; /* user dquot */ struct xfs_dquot *i_udquot; /* user dquot */
struct xfs_dquot *i_gdquot; /* group dquot */ struct xfs_dquot *i_gdquot; /* group dquot */

2
fs/xfs/xfs_vfsops.c
View File

@ -283,7 +283,7 @@ xfs_sync_inodes(
int *bypassed) int *bypassed)
{ {
xfs_inode_t *ip = NULL; xfs_inode_t *ip = NULL;
bhv_vnode_t *vp = NULL; struct inode *vp = NULL;
int error; int error;
int last_error; int last_error;
uint64_t fflag; uint64_t fflag;

2
fs/xfs/xfs_vnodeops.c
View File

@ -2850,7 +2850,7 @@ xfs_finish_reclaim(
int sync_mode) int sync_mode)
{ {
xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino); xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino);
bhv_vnode_t *vp = VFS_I(ip); struct inode *vp = VFS_I(ip);
if (vp && VN_BAD(vp)) if (vp && VN_BAD(vp))
goto reclaim; goto reclaim;