diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-11 23:14:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-11 23:14:57 +0200 |
| commit | 582076ab16779208e7eb6ce712a9c0a6cc5bafe4 (patch) | |
| tree | 6841c02fa19dba9c4a8299592a7f14344f8944f7 /fs/btrfs/ioctl.c | |
| parent | Merge tag 'spi-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | 9pnet_rdma: check token type before int conversion (diff) | |
| download | linux-582076ab16779208e7eb6ce712a9c0a6cc5bafe4.tar.xz linux-582076ab16779208e7eb6ce712a9c0a6cc5bafe4.zip | |
Merge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p changes from Eric Van Hensbergen:
"A bunch of updates and cleanup within the transport layer,
particularly with a focus on RDMA"
* tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9pnet_rdma: check token type before int conversion
9pnet: trans_fd : allocate struct p9_trans_fd and struct p9_conn together.
9pnet: p9_client->conn field is unused. Remove it.
9P: Get rid of REQ_STATUS_FLSH
9pnet_rdma: add cancelled()
9pnet_rdma: update request status during send
9P: Add cancelled() to the transport functions.
net: Mark function as static in 9p/client.c
9P: Add memory barriers to protect request fields over cb/rpc threads handoff
Diffstat (limited to 'fs/btrfs/ioctl.c')
0 files changed, 0 insertions, 0 deletions