diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 14:36:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 14:36:16 -0700 |
| commit | b8b3e9058f0f1d5c5a81c7d3d46f373d5f59a82c (patch) | |
| tree | 1033085760392dc7e24a79bbeb276ce1a34314d0 /include/linux | |
| parent | 51102ee5b8853d230e534cbcd0d888f0134738a3 (diff) | |
| parent | 327aec03ac4c7bbf5e41ff03ac3a84c424589f27 (diff) | |
| download | blackbird-op-linux-b8b3e9058f0f1d5c5a81c7d3d46f373d5f59a82c.tar.gz blackbird-op-linux-b8b3e9058f0f1d5c5a81c7d3d46f373d5f59a82c.zip | |
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: (22 commits)
9p: fix sparse warnings in new xattr code
fs/9p: remove sparse warning in vfs_inode
fs/9p: destroy fid on failed remove
fs/9p: Prevent parallel rename when doing fid_lookup
fs/9p: Add support user. xattr
net/9p: Implement TXATTRCREATE 9p call
net/9p: Implement attrwalk 9p call
9p: Implement LOPEN
fs/9p: This patch implements TLCREATE for 9p2000.L protocol.
9p: Implement TMKDIR
9p: Implement TMKNOD
9p: Define and implement TSYMLINK for 9P2000.L
9p: Define and implement TLINK for 9P2000.L
9p: Define and implement TLINK for 9P2000.L
9p: Implement client side of setattr for 9P2000.L protocol.
9p: getattr client implementation for 9P2000.L protocol.
fs/9p: Pass the correct user credentials during attach
net/9p: Handle the server returned error properly
9p: readdir implementation for 9p2000.L
9p: Make use of iounit for read/write
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/virtio_9p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/virtio_9p.h b/include/linux/virtio_9p.h index 5cf11765146b..395c38a47adb 100644 --- a/include/linux/virtio_9p.h +++ b/include/linux/virtio_9p.h @@ -4,6 +4,7 @@ * compatible drivers/servers. */ #include <linux/virtio_ids.h> #include <linux/virtio_config.h> +#include <linux/types.h> /* The feature bitmap for virtio 9P */ |
