diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-15 23:31:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-15 23:31:15 -0400 |
| commit | 0ebc115da3ed67409792eb8de46361a5c673f072 (patch) | |
| tree | 214b1a218dd84c3ac7bb66a3648fbbe41d72226b /include/net/9p/9p.h | |
| parent | e82e6f16a809bc47eb929c3408921def28638fcd (diff) | |
| parent | b76225e22ac98070325ee2ba89473c1e1360c4cb (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:
net/9p: nwname should be an unsigned int
9p: Fix sparse error
fs/9p: Fix error reported by coccicheck
9p: revert tsyncfs related changes
fs/9p: Use write_inode for data sync on server
fs/9p: Fix revalidate to return correct value
Diffstat (limited to 'include/net/9p/9p.h')
| -rw-r--r-- | include/net/9p/9p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h index cdf2e8ac4309..d2df55b0c213 100644 --- a/include/net/9p/9p.h +++ b/include/net/9p/9p.h | |||
| @@ -139,8 +139,6 @@ do { \ | |||
| 139 | */ | 139 | */ |
| 140 | 140 | ||
| 141 | enum p9_msg_t { | 141 | enum p9_msg_t { |
| 142 | P9_TSYNCFS = 0, | ||
| 143 | P9_RSYNCFS, | ||
| 144 | P9_TLERROR = 6, | 142 | P9_TLERROR = 6, |
| 145 | P9_RLERROR, | 143 | P9_RLERROR, |
| 146 | P9_TSTATFS = 8, | 144 | P9_TSTATFS = 8, |