SCCS-vsn: sys/ufs/ffs/inode.h 7.27
SCCS-vsn: sys/ufs/ufs/inode.h 7.27
SCCS-vsn: sys/ufs/ffs/dinode.h 7.16
SCCS-vsn: sys/ufs/ufs/dinode.h 7.16
*
* %sccs.include.redist.c%
*
*
* %sccs.include.redist.c%
*
- * @(#)dinode.h 7.15 (Berkeley) %G%
+ * @(#)dinode.h 7.16 (Berkeley) %G%
short di_nlink; /* 2: number of links to file */
u_short di_ouid; /* 4: old owner's user id */
u_short di_ogid; /* 6: old owner's group id */
short di_nlink; /* 2: number of links to file */
u_short di_ouid; /* 4: old owner's user id */
u_short di_ogid; /* 6: old owner's group id */
- u_quad_t di_qsize; /* 8: number of bytes in file */
+ u_quad_t di_size; /* 8: number of bytes in file */
struct timespec di_atime; /* 16: time last accessed */
struct timespec di_mtime; /* 24: time last modified */
struct timespec di_ctime; /* 32: last time inode changed */
struct timespec di_atime; /* 16: time last accessed */
struct timespec di_mtime; /* 24: time last modified */
struct timespec di_ctime; /* 32: last time inode changed */
long di_spare[2]; /* 120: reserved, currently unused */
};
long di_spare[2]; /* 120: reserved, currently unused */
};
-#ifdef _NOQUAD
-#define di_size di_qsize.val[_QUAD_LOWWORD]
-#else
-#define di_size di_qsize
-#endif
-
-#if defined(tahoe) /* ugh! -- must be fixed */
-#undef di_size
-#define di_size di_qsize.val[0]
-#endif
-
#define di_rdev di_db[0]
/* file modes */
#define di_rdev di_db[0]
/* file modes */
*
* %sccs.include.redist.c%
*
*
* %sccs.include.redist.c%
*
- * @(#)inode.h 7.26 (Berkeley) %G%
+ * @(#)inode.h 7.27 (Berkeley) %G%
*/
#include <ufs/ufs/dinode.h>
*/
#include <ufs/ufs/dinode.h>
#define i_nlink i_din.di_nlink
#define i_uid i_din.di_uid
#define i_gid i_din.di_gid
#define i_nlink i_din.di_nlink
#define i_uid i_din.di_uid
#define i_gid i_din.di_gid
-#ifdef _NOQUAD
-#define i_size i_din.di_qsize.val[_QUAD_LOWWORD]
-#else
-#define i_size i_din.di_qsize
-#endif
-#if defined(tahoe) /* ugh! -- must be fixed */
-#undef i_size
-#define i_size i_din.di_qsize.val[0]
-#endif
+#define i_size i_din.di_size
#define i_db i_din.di_db
#define i_ib i_din.di_ib
#define i_atime i_din.di_atime
#define i_db i_din.di_db
#define i_ib i_din.di_ib
#define i_atime i_din.di_atime
(ip)->i_atime.ts_sec = (t1)->tv_sec; \
if ((ip)->i_flag&IUPD) { \
(ip)->i_mtime.ts_sec = (t2)->tv_sec; \
(ip)->i_atime.ts_sec = (t1)->tv_sec; \
if ((ip)->i_flag&IUPD) { \
(ip)->i_mtime.ts_sec = (t2)->tv_sec; \
- INCRQUAD((ip)->i_modrev); \
} \
if ((ip)->i_flag&ICHG) \
(ip)->i_ctime.ts_sec = time.tv_sec; \
} \
if ((ip)->i_flag&ICHG) \
(ip)->i_ctime.ts_sec = time.tv_sec; \
*
* %sccs.include.redist.c%
*
*
* %sccs.include.redist.c%
*
- * @(#)dinode.h 7.15 (Berkeley) %G%
+ * @(#)dinode.h 7.16 (Berkeley) %G%
short di_nlink; /* 2: number of links to file */
u_short di_ouid; /* 4: old owner's user id */
u_short di_ogid; /* 6: old owner's group id */
short di_nlink; /* 2: number of links to file */
u_short di_ouid; /* 4: old owner's user id */
u_short di_ogid; /* 6: old owner's group id */
- u_quad_t di_qsize; /* 8: number of bytes in file */
+ u_quad_t di_size; /* 8: number of bytes in file */
struct timespec di_atime; /* 16: time last accessed */
struct timespec di_mtime; /* 24: time last modified */
struct timespec di_ctime; /* 32: last time inode changed */
struct timespec di_atime; /* 16: time last accessed */
struct timespec di_mtime; /* 24: time last modified */
struct timespec di_ctime; /* 32: last time inode changed */
long di_spare[2]; /* 120: reserved, currently unused */
};
long di_spare[2]; /* 120: reserved, currently unused */
};
-#ifdef _NOQUAD
-#define di_size di_qsize.val[_QUAD_LOWWORD]
-#else
-#define di_size di_qsize
-#endif
-
-#if defined(tahoe) /* ugh! -- must be fixed */
-#undef di_size
-#define di_size di_qsize.val[0]
-#endif
-
#define di_rdev di_db[0]
/* file modes */
#define di_rdev di_db[0]
/* file modes */
*
* %sccs.include.redist.c%
*
*
* %sccs.include.redist.c%
*
- * @(#)inode.h 7.26 (Berkeley) %G%
+ * @(#)inode.h 7.27 (Berkeley) %G%
*/
#include <ufs/ufs/dinode.h>
*/
#include <ufs/ufs/dinode.h>
#define i_nlink i_din.di_nlink
#define i_uid i_din.di_uid
#define i_gid i_din.di_gid
#define i_nlink i_din.di_nlink
#define i_uid i_din.di_uid
#define i_gid i_din.di_gid
-#ifdef _NOQUAD
-#define i_size i_din.di_qsize.val[_QUAD_LOWWORD]
-#else
-#define i_size i_din.di_qsize
-#endif
-#if defined(tahoe) /* ugh! -- must be fixed */
-#undef i_size
-#define i_size i_din.di_qsize.val[0]
-#endif
+#define i_size i_din.di_size
#define i_db i_din.di_db
#define i_ib i_din.di_ib
#define i_atime i_din.di_atime
#define i_db i_din.di_db
#define i_ib i_din.di_ib
#define i_atime i_din.di_atime
(ip)->i_atime.ts_sec = (t1)->tv_sec; \
if ((ip)->i_flag&IUPD) { \
(ip)->i_mtime.ts_sec = (t2)->tv_sec; \
(ip)->i_atime.ts_sec = (t1)->tv_sec; \
if ((ip)->i_flag&IUPD) { \
(ip)->i_mtime.ts_sec = (t2)->tv_sec; \
- INCRQUAD((ip)->i_modrev); \
} \
if ((ip)->i_flag&ICHG) \
(ip)->i_ctime.ts_sec = time.tv_sec; \
} \
if ((ip)->i_flag&ICHG) \
(ip)->i_ctime.ts_sec = time.tv_sec; \