diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 18:21:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 18:21:54 -0400 |
commit | a7ddbf891b8236b51fb3c9574555eb7d7d13aca6 (patch) | |
tree | cb62a2198be1397fedc5a60ba3313a4769fa4e12 /include | |
parent | 3e56d49390cd161f34cc049a3661045183d276d5 (diff) | |
parent | f4edeeb3937d5f9953b5722f1cca9573d5ffe8a0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: Update documentation to add fscache related bits
9p: Add fscache support to 9p
9p: Fix the incorrect update of inode size in v9fs_file_write()
9p: Use the i_size_[read, write]() macros instead of using inode->i_size directly.
Diffstat (limited to 'include')
-rw-r--r-- | include/net/9p/9p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h index b77c1478c99f..a7fb54808a23 100644 --- a/include/net/9p/9p.h +++ b/include/net/9p/9p.h | |||
@@ -38,6 +38,8 @@ | |||
38 | * @P9_DEBUG_SLABS: memory management tracing | 38 | * @P9_DEBUG_SLABS: memory management tracing |
39 | * @P9_DEBUG_FCALL: verbose dump of protocol messages | 39 | * @P9_DEBUG_FCALL: verbose dump of protocol messages |
40 | * @P9_DEBUG_FID: fid allocation/deallocation tracking | 40 | * @P9_DEBUG_FID: fid allocation/deallocation tracking |
41 | * @P9_DEBUG_PKT: packet marshalling/unmarshalling | ||
42 | * @P9_DEBUG_FSC: FS-cache tracing | ||
41 | * | 43 | * |
42 | * These flags are passed at mount time to turn on various levels of | 44 | * These flags are passed at mount time to turn on various levels of |
43 | * verbosity and tracing which will be output to the system logs. | 45 | * verbosity and tracing which will be output to the system logs. |
@@ -54,6 +56,7 @@ enum p9_debug_flags { | |||
54 | P9_DEBUG_FCALL = (1<<8), | 56 | P9_DEBUG_FCALL = (1<<8), |
55 | P9_DEBUG_FID = (1<<9), | 57 | P9_DEBUG_FID = (1<<9), |
56 | P9_DEBUG_PKT = (1<<10), | 58 | P9_DEBUG_PKT = (1<<10), |
59 | P9_DEBUG_FSC = (1<<11), | ||
57 | }; | 60 | }; |
58 | 61 | ||
59 | #ifdef CONFIG_NET_9P_DEBUG | 62 | #ifdef CONFIG_NET_9P_DEBUG |