Cosmetic changes; fix indentation and usage of white spaces.
This commit is contained in:
enami
parent
46b5560f98
commit
068ded93c6
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: inode.h,v 1.14 1999/11/15 18:49:15 fvdl Exp $ */
|
||||
/* $NetBSD: inode.h,v 1.15 1999/11/18 08:23:22 enami Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1989, 1993
|
||||
|
|
@ -48,8 +48,8 @@
|
|||
* Per-filesystem inode extensions.
|
||||
*/
|
||||
struct ext2fs_inode_ext {
|
||||
ufs_daddr_t ext2fs_last_lblk; /* last logical block allocated */
|
||||
ufs_daddr_t ext2fs_last_blk; /* last block allocated on disk */
|
||||
ufs_daddr_t ext2fs_last_lblk; /* last logical block allocated */
|
||||
ufs_daddr_t ext2fs_last_blk; /* last block allocated on disk */
|
||||
};
|
||||
|
||||
struct ffs_inode_ext {
|
||||
|
|
@ -67,8 +67,8 @@ struct ffs_inode_ext {
|
|||
*/
|
||||
struct inode {
|
||||
LIST_ENTRY(inode) i_hash;/* Hash chain. */
|
||||
struct vnode *i_vnode;/* Vnode associated with this inode. */
|
||||
struct vnode *i_devvp;/* Vnode for block I/O. */
|
||||
struct vnode *i_vnode; /* Vnode associated with this inode. */
|
||||
struct vnode *i_devvp; /* Vnode for block I/O. */
|
||||
u_int32_t i_flag; /* flags, see below */
|
||||
dev_t i_dev; /* Device associated with the inode. */
|
||||
ino_t i_number; /* The identity of the inode. */
|
||||
|
|
@ -76,11 +76,11 @@ struct inode {
|
|||
union { /* Associated filesystem. */
|
||||
struct fs *fs; /* FFS */
|
||||
struct lfs *lfs; /* LFS */
|
||||
struct m_ext2fs *e2fs; /* EXT2FS */
|
||||
struct m_ext2fs *e2fs; /* EXT2FS */
|
||||
} inode_u;
|
||||
#define i_fs inode_u.fs
|
||||
#define i_lfs inode_u.lfs
|
||||
#define i_e2fs inode_u.e2fs
|
||||
#define i_e2fs inode_u.e2fs
|
||||
|
||||
struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */
|
||||
u_quad_t i_modrev; /* Revision level for NFS lease. */
|
||||
|
|
@ -99,27 +99,27 @@ struct inode {
|
|||
*/
|
||||
union {
|
||||
/* Other extensions could go here... */
|
||||
struct ext2fs_inode_ext e2fs;
|
||||
struct ffs_inode_ext ffs;
|
||||
struct ext2fs_inode_ext e2fs;
|
||||
struct ffs_inode_ext ffs;
|
||||
} inode_ext;
|
||||
#define i_e2fs_last_lblk inode_ext.e2fs.ext2fs_last_lblk
|
||||
#define i_e2fs_last_blk inode_ext.e2fs.ext2fs_last_blk
|
||||
#define i_ffs_effnlink inode_ext.ffs.ffs_effnlink
|
||||
#define i_e2fs_last_lblk inode_ext.e2fs.ext2fs_last_lblk
|
||||
#define i_e2fs_last_blk inode_ext.e2fs.ext2fs_last_blk
|
||||
#define i_ffs_effnlink inode_ext.ffs.ffs_effnlink
|
||||
|
||||
/*
|
||||
* The on-disk dinode itself.
|
||||
*/
|
||||
union {
|
||||
struct dinode ffs_din; /* 128 bytes of the on-disk dinode. */
|
||||
struct ext2fs_dinode e2fs_din; /* 128 bytes of the on-disk dinode. */
|
||||
struct ext2fs_dinode e2fs_din; /* 128 bytes of the on-disk dinode. */
|
||||
} i_din;
|
||||
};
|
||||
|
||||
#define i_ffs_atime i_din.ffs_din.di_atime
|
||||
#define i_ffs_atimensec i_din.ffs_din.di_atimensec
|
||||
#define i_ffs_blocks i_din.ffs_din.di_blocks
|
||||
#define i_ffs_atimensec i_din.ffs_din.di_atimensec
|
||||
#define i_ffs_blocks i_din.ffs_din.di_blocks
|
||||
#define i_ffs_ctime i_din.ffs_din.di_ctime
|
||||
#define i_ffs_ctimensec i_din.ffs_din.di_ctimensec
|
||||
#define i_ffs_ctimensec i_din.ffs_din.di_ctimensec
|
||||
#define i_ffs_db i_din.ffs_din.di_db
|
||||
#define i_ffs_flags i_din.ffs_din.di_flags
|
||||
#define i_ffs_gen i_din.ffs_din.di_gen
|
||||
|
|
@ -127,31 +127,31 @@ struct inode {
|
|||
#define i_ffs_ib i_din.ffs_din.di_ib
|
||||
#define i_ffs_mode i_din.ffs_din.di_mode
|
||||
#define i_ffs_mtime i_din.ffs_din.di_mtime
|
||||
#define i_ffs_mtimensec i_din.ffs_din.di_mtimensec
|
||||
#define i_ffs_mtimensec i_din.ffs_din.di_mtimensec
|
||||
#define i_ffs_nlink i_din.ffs_din.di_nlink
|
||||
#define i_ffs_rdev i_din.ffs_din.di_rdev
|
||||
#define i_ffs_shortlink i_din.ffs_din.di_shortlink
|
||||
#define i_ffs_shortlink i_din.ffs_din.di_shortlink
|
||||
#define i_ffs_size i_din.ffs_din.di_size
|
||||
#define i_ffs_uid i_din.ffs_din.di_uid
|
||||
|
||||
#define i_e2fs_mode i_din.e2fs_din.e2di_mode
|
||||
#define i_e2fs_uid i_din.e2fs_din.e2di_uid
|
||||
#define i_e2fs_size i_din.e2fs_din.e2di_size
|
||||
#define i_e2fs_atime i_din.e2fs_din.e2di_atime
|
||||
#define i_e2fs_ctime i_din.e2fs_din.e2di_ctime
|
||||
#define i_e2fs_mtime i_din.e2fs_din.e2di_mtime
|
||||
#define i_e2fs_dtime i_din.e2fs_din.e2di_dtime
|
||||
#define i_e2fs_gid i_din.e2fs_din.e2di_gid
|
||||
#define i_e2fs_nlink i_din.e2fs_din.e2di_nlink
|
||||
#define i_e2fs_nblock i_din.e2fs_din.e2di_nblock
|
||||
#define i_e2fs_flags i_din.e2fs_din.e2di_flags
|
||||
#define i_e2fs_blocks i_din.e2fs_din.e2di_blocks
|
||||
#define i_e2fs_gen i_din.e2fs_din.e2di_gen
|
||||
#define i_e2fs_facl i_din.e2fs_din.e2di_facl
|
||||
#define i_e2fs_dacl i_din.e2fs_din.e2di_dacl
|
||||
#define i_e2fs_faddr i_din.e2fs_din.e2di_faddr
|
||||
#define i_e2fs_nfrag i_din.e2fs_din.e2di_nfrag
|
||||
#define i_e2fs_fsize i_din.e2fs_din.e2di_fsize
|
||||
#define i_e2fs_mode i_din.e2fs_din.e2di_mode
|
||||
#define i_e2fs_uid i_din.e2fs_din.e2di_uid
|
||||
#define i_e2fs_size i_din.e2fs_din.e2di_size
|
||||
#define i_e2fs_atime i_din.e2fs_din.e2di_atime
|
||||
#define i_e2fs_ctime i_din.e2fs_din.e2di_ctime
|
||||
#define i_e2fs_mtime i_din.e2fs_din.e2di_mtime
|
||||
#define i_e2fs_dtime i_din.e2fs_din.e2di_dtime
|
||||
#define i_e2fs_gid i_din.e2fs_din.e2di_gid
|
||||
#define i_e2fs_nlink i_din.e2fs_din.e2di_nlink
|
||||
#define i_e2fs_nblock i_din.e2fs_din.e2di_nblock
|
||||
#define i_e2fs_flags i_din.e2fs_din.e2di_flags
|
||||
#define i_e2fs_blocks i_din.e2fs_din.e2di_blocks
|
||||
#define i_e2fs_gen i_din.e2fs_din.e2di_gen
|
||||
#define i_e2fs_facl i_din.e2fs_din.e2di_facl
|
||||
#define i_e2fs_dacl i_din.e2fs_din.e2di_dacl
|
||||
#define i_e2fs_faddr i_din.e2fs_din.e2di_faddr
|
||||
#define i_e2fs_nfrag i_din.e2fs_din.e2di_nfrag
|
||||
#define i_e2fs_fsize i_din.e2fs_din.e2di_fsize
|
||||
|
||||
/* These flags are kept in i_flag. */
|
||||
#define IN_ACCESS 0x0001 /* Access time update request. */
|
||||
|
|
@ -161,7 +161,7 @@ struct inode {
|
|||
#define IN_RENAME 0x0010 /* Inode is being renamed. */
|
||||
#define IN_SHLOCK 0x0020 /* File has shared lock. */
|
||||
#define IN_EXLOCK 0x0040 /* File has exclusive lock. */
|
||||
#define IN_CLEANING 0x0080 /* LFS: file is being cleaned */
|
||||
#define IN_CLEANING 0x0080 /* LFS: file is being cleaned */
|
||||
|
||||
#ifdef _KERNEL
|
||||
/*
|
||||
|
|
@ -182,48 +182,48 @@ struct indir {
|
|||
if ((ip)->i_flag & (IN_ACCESS | IN_CHANGE | IN_UPDATE)) { \
|
||||
(ip)->i_flag |= IN_MODIFIED; \
|
||||
if ((ip)->i_flag & IN_ACCESS) { \
|
||||
(ip)->i_ffs_atime = (acc)->tv_sec; \
|
||||
(ip)->i_ffs_atime = (acc)->tv_sec; \
|
||||
(ip)->i_ffs_atimensec = (acc)->tv_nsec; \
|
||||
} \
|
||||
if ((ip)->i_flag & IN_UPDATE) { \
|
||||
(ip)->i_ffs_mtime = (mod)->tv_sec; \
|
||||
(ip)->i_ffs_mtime = (mod)->tv_sec; \
|
||||
(ip)->i_ffs_mtimensec = (mod)->tv_nsec; \
|
||||
(ip)->i_modrev++; \
|
||||
} \
|
||||
if ((ip)->i_flag & IN_CHANGE) { \
|
||||
(ip)->i_ffs_ctime = (cre)->tv_sec; \
|
||||
(ip)->i_ffs_ctime = (cre)->tv_sec; \
|
||||
(ip)->i_ffs_ctimensec = (cre)->tv_nsec; \
|
||||
} \
|
||||
(ip)->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_UPDATE); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define EXT2FS_ITIMES(ip, acc, mod, cre) { \
|
||||
#define EXT2FS_ITIMES(ip, acc, mod, cre) { \
|
||||
if ((ip)->i_flag & (IN_ACCESS | IN_CHANGE | IN_UPDATE)) { \
|
||||
(ip)->i_flag |= IN_MODIFIED; \
|
||||
if ((ip)->i_flag & IN_ACCESS) { \
|
||||
(ip)->i_e2fs_atime = (acc)->tv_sec; \
|
||||
(ip)->i_e2fs_atime = (acc)->tv_sec; \
|
||||
} \
|
||||
if ((ip)->i_flag & IN_UPDATE) { \
|
||||
(ip)->i_e2fs_mtime = (mod)->tv_sec; \
|
||||
(ip)->i_e2fs_mtime = (mod)->tv_sec; \
|
||||
(ip)->i_modrev++; \
|
||||
} \
|
||||
if ((ip)->i_flag & IN_CHANGE) { \
|
||||
(ip)->i_e2fs_ctime = (cre)->tv_sec; \
|
||||
(ip)->i_e2fs_ctime = (cre)->tv_sec; \
|
||||
} \
|
||||
(ip)->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_UPDATE); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define ITIMES(ip, acc, mod, cre) { \
|
||||
if (IS_EXT2_VNODE((ip)->i_vnode)) \
|
||||
EXT2FS_ITIMES(ip, acc, mod, cre) \
|
||||
else \
|
||||
FFS_ITIMES(ip, acc, mod, cre) \
|
||||
#define ITIMES(ip, acc, mod, cre) { \
|
||||
if (IS_EXT2_VNODE((ip)->i_vnode)) \
|
||||
EXT2FS_ITIMES(ip, acc, mod, cre) \
|
||||
else \
|
||||
FFS_ITIMES(ip, acc, mod, cre) \
|
||||
}
|
||||
|
||||
/* Determine if soft dependencies are being done */
|
||||
#define DOINGSOFTDEP(vp) ((vp)->v_mount->mnt_flag & MNT_SOFTDEP)
|
||||
#define DOINGSOFTDEP(vp) ((vp)->v_mount->mnt_flag & MNT_SOFTDEP)
|
||||
|
||||
/* This overlays the fid structure (see mount.h). */
|
||||
struct ufid {
|
||||
|
|
|
|||
Loading…
Reference in New Issue