d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This patch fixes a size problem with the stat structure for

Browse Source 
64-bit architectures that was introduced in the UFS2 code
merge two days ago. The stat structure change that caused
the problem was the addition of the file create time.

Submitted by:	Bruce Evans <bde@zeta.org.au>
Sponsored by:	DARPA & NAI Labs.
This commit is contained in:
Kirk McKusick 2002-06-22 22:01:13 +00:00
parent 78509eac91
commit 6524dddcd5
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/vfs_extattr.c
View File

@ -2596,6 +2596,7 @@ cvtnstat(sb, nsb)
struct stat *sb;
struct nstat *nsb;
{
bzero(nsb, sizeof nsb);
nsb->st_dev = sb->st_dev;
nsb->st_ino = sb->st_ino;
nsb->st_mode = sb->st_mode;
@ -2612,7 +2613,6 @@ cvtnstat(sb, nsb)
nsb->st_flags = sb->st_flags;
nsb->st_gen = sb->st_gen;
nsb->st_createtimespec = sb->st_createtimespec;
nsb->st_qspare = sb->st_qspare;
}
#ifndef _SYS_SYSPROTO_H_

2
sys/kern/vfs_syscalls.c
View File

@ -2596,6 +2596,7 @@ cvtnstat(sb, nsb)
struct stat *sb;
struct nstat *nsb;
{
bzero(nsb, sizeof nsb);
nsb->st_dev = sb->st_dev;
nsb->st_ino = sb->st_ino;
nsb->st_mode = sb->st_mode;
@ -2612,7 +2613,6 @@ cvtnstat(sb, nsb)
nsb->st_flags = sb->st_flags;
nsb->st_gen = sb->st_gen;
nsb->st_createtimespec = sb->st_createtimespec;
nsb->st_qspare = sb->st_qspare;
}
#ifndef _SYS_SYSPROTO_H_

3
sys/kern/vfs_vnops.c
View File

@ -562,8 +562,7 @@ vn_stat(vp, sb, td)
/*
* Zero the spare stat fields
*/
sb->st_lspare = 0;
sb->st_qspare = 0;
bzero(sb, sizeof sb);
/*
* Copy from vattr table

34
sys/sys/stat.h
View File

@ -109,9 +109,23 @@ struct stat {
u_int32_t st_blksize; /* optimal blocksize for I/O */
fflags_t st_flags; /* user defined flags for file */
u_int32_t st_gen; /* file generation number */
struct timespec st_createtimespec; /* time of file creation */
int32_t st_lspare;
int64_t st_qspare;
#ifndef _POSIX_SOURCE
struct timespec st_createtimespec; /* time of file creation */
#else
time_t st_createtime; /* time of file creation */
long st_createtimensec; /* nsec of file creation */
#endif
/*
* Explicitly pad st_createtimespec to 16 bytes so that the size of
* struct stat is backwards compatible. We use bitfields instead
* of an array of chars so that this doesn't require a C99 compiler
* to compile if the size of the padding is 0. We use 2 bitfields
* to cover up to 64 bits on 32-bit machines. We assume that
* CHAR_BIT is 8...
*/
int :(8 / 2) * (16 - (int)sizeof(struct timespec));
int :(8 / 2) * (16 - (int)sizeof(struct timespec));
};
#ifndef _POSIX_SOURCE
@ -123,25 +137,20 @@ struct nstat {
uid_t st_uid; /* user ID of the file's owner */
gid_t st_gid; /* group ID of the file's group */
__dev_t st_rdev; /* device type */
#ifndef _POSIX_SOURCE
struct timespec st_atimespec; /* time of last access */
struct timespec st_mtimespec; /* time of last data modification */
struct timespec st_ctimespec; /* time of last file status change */
#else
time_t st_atime; /* time of last access */
long st_atimensec; /* nsec of last access */
time_t st_mtime; /* time of last data modification */
long st_mtimensec; /* nsec of last data modification */
time_t st_ctime; /* time of last file status change */
long st_ctimensec; /* nsec of last file status change */
#endif
off_t st_size; /* file size, in bytes */
int64_t st_blocks; /* blocks allocated for file */
u_int32_t st_blksize; /* optimal blocksize for I/O */
fflags_t st_flags; /* user defined flags for file */
u_int32_t st_gen; /* file generation number */
struct timespec st_createtimespec; /* time of file creation */
int64_t st_qspare;
/*
* See above about the following padding.
*/
int :(8 / 2) * (16 - (int)sizeof(struct timespec));
int :(8 / 2) * (16 - (int)sizeof(struct timespec));
};
#endif
@ -151,6 +160,7 @@ struct nstat {
#define st_atime st_atimespec.tv_sec
#define st_mtime st_mtimespec.tv_sec
#define st_ctime st_ctimespec.tv_sec
#define st_createtime st_createtimespec.tv_sec
#endif
#define S_ISUID 0004000 /* set user id on execution */