diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/nfs_iostat.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'include/linux/nfs_iostat.h')
| -rw-r--r-- | include/linux/nfs_iostat.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/nfs_iostat.h b/include/linux/nfs_iostat.h index 1cb9a3fed2b3..68b10f5f8907 100644 --- a/include/linux/nfs_iostat.h +++ b/include/linux/nfs_iostat.h | |||
| @@ -116,4 +116,16 @@ enum nfs_stat_eventcounters { | |||
| 116 | __NFSIOS_COUNTSMAX, | 116 | __NFSIOS_COUNTSMAX, |
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| 119 | /* | ||
| 120 | * NFS local caching servicing counters | ||
| 121 | */ | ||
| 122 | enum nfs_stat_fscachecounters { | ||
| 123 | NFSIOS_FSCACHE_PAGES_READ_OK, | ||
| 124 | NFSIOS_FSCACHE_PAGES_READ_FAIL, | ||
| 125 | NFSIOS_FSCACHE_PAGES_WRITTEN_OK, | ||
| 126 | NFSIOS_FSCACHE_PAGES_WRITTEN_FAIL, | ||
| 127 | NFSIOS_FSCACHE_PAGES_UNCACHED, | ||
| 128 | __NFSIOS_FSCACHEMAX, | ||
| 129 | }; | ||
| 130 | |||
| 119 | #endif /* _LINUX_NFS_IOSTAT */ | 131 | #endif /* _LINUX_NFS_IOSTAT */ |