Module Name: src
Committed By: christos
Date: Sat Apr 11 15:46:19 UTC 2009
Modified Files:
src/sys/kern: sys_pipe.c
src/sys/sys: pipe.h
Log Message:
rename ctime to btime for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.26 -r1.27 src/sys/sys/pipe.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_pipe.c
diff -u src/sys/kern/sys_pipe.c:1.110 src/sys/kern/sys_pipe.c:1.111
--- src/sys/kern/sys_pipe.c:1.110 Sat Apr 11 10:42:28 2009
+++ src/sys/kern/sys_pipe.c Sat Apr 11 11:46:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_pipe.c,v 1.110 2009/04/11 14:42:28 christos Exp $ */
+/* $NetBSD: sys_pipe.c,v 1.111 2009/04/11 15:46:18 christos Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.110 2009/04/11 14:42:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.111 2009/04/11 15:46:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -349,9 +349,8 @@
KASSERT(pipe != NULL);
*pipep = pipe;
error = 0;
- getnanotime(&pipe->pipe_ctime);
- pipe->pipe_atime = pipe->pipe_ctime;
- pipe->pipe_mtime = pipe->pipe_ctime;
+ getnanotime(&pipe->pipe_btime);
+ pipe->pipe_atime = pipe->pipe_mtime = pipe->pipe_btime;
pipe->pipe_lock = mutex;
if (cache == pipe_rd_cache) {
error = pipespace(pipe, PIPE_SIZE);
@@ -585,7 +584,7 @@
}
if (error == 0)
- getnanoime(&rpipe->pipe_atime);
+ getnanotime(&rpipe->pipe_atime);
pipeunlock(rpipe);
unlocked_error:
@@ -1195,7 +1194,7 @@
ub->st_blocks = (ub->st_size) ? 1 : 0;
ub->st_atimespec = pipe->pipe_atime;
ub->st_mtimespec = pipe->pipe_mtime;
- ub->st_ctimespec = ub->st_birthtimespec = pipe->pipe_ctime;
+ ub->st_ctimespec = ub->st_birthtimespec = pipe->pipe_btime;
ub->st_uid = kauth_cred_geteuid(fp->f_cred);
ub->st_gid = kauth_cred_getegid(fp->f_cred);
Index: src/sys/sys/pipe.h
diff -u src/sys/sys/pipe.h:1.26 src/sys/sys/pipe.h:1.27
--- src/sys/sys/pipe.h:1.26 Sat Apr 11 10:42:28 2009
+++ src/sys/sys/pipe.h Sat Apr 11 11:46:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pipe.h,v 1.26 2009/04/11 14:42:28 christos Exp $ */
+/* $NetBSD: pipe.h,v 1.27 2009/04/11 15:46:18 christos Exp $ */
/*
* Copyright (c) 1996 John S. Dyson
@@ -111,7 +111,7 @@
struct selinfo pipe_sel; /* for compat with select */
struct timespec pipe_atime; /* time of last access */
struct timespec pipe_mtime; /* time of last modify */
- struct timespec pipe_ctime; /* time of status change */
+ struct timespec pipe_btime; /* time of creation */
pid_t pipe_pgid; /* process group for sigio */
struct pipe *pipe_peer; /* link with other direction */
u_int pipe_state; /* pipe status info */
