diff options
author | John Sonnenschein <johns@joyent.com> | 2012-01-26 22:45:08 +0000 |
---|---|---|
committer | John Sonnenschein <johns@joyent.com> | 2012-01-26 22:45:08 +0000 |
commit | 92fb61a58dea0e097df79e73d3cda1bef52c4339 (patch) | |
tree | 8a9727b7a3600c29b261de4580520de19ec57e56 /usr/src/uts/common/sys/fss.h | |
parent | d6f90348d6442b80b8e77a4aaf217cbf86c54bdb (diff) | |
parent | 6a5fc1386817167c00f9ee99bebd9ce35d434593 (diff) | |
download | illumos-joyent-gcc4.tar.gz |
Merge branch 'gcc4' of git.joyent.com:illumos-joyent into gcc4gcc4
Diffstat (limited to 'usr/src/uts/common/sys/fss.h')
-rw-r--r-- | usr/src/uts/common/sys/fss.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/uts/common/sys/fss.h b/usr/src/uts/common/sys/fss.h index 583586fd75..cdb47beb7f 100644 --- a/usr/src/uts/common/sys/fss.h +++ b/usr/src/uts/common/sys/fss.h @@ -22,6 +22,7 @@ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2012 Joyent, Inc. All rights reserved. */ #ifndef _SYS_FSS_H @@ -86,6 +87,7 @@ typedef struct fsspset { /* on the list */ struct fssproj *fssps_list; /* list of project parts */ struct fsszone *fssps_zones; /* list of fsszone_t's in pset */ + uint32_t fssps_gen; /* generation for zone's kstats */ } fsspset_t; /* @@ -103,6 +105,8 @@ typedef struct fssproj { /* protected by fssps_displock */ uint32_t fssp_ticks; /* total of all ticks */ /* protected by fssps_displock */ + uint32_t fssp_zone_ticks; /* unscaled total of all ticks */ + /* protected by fssps_displock */ fssusage_t fssp_usage; /* this project's decayed usage */ fssusage_t fssp_shusage; /* normalized usage */ struct fssproj *fssp_next; /* next project on this pset */ |