summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/scrub.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-11 14:14:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-11 14:14:57 -0700
commit582076ab16779208e7eb6ce712a9c0a6cc5bafe4 (patch)
tree6841c02fa19dba9c4a8299592a7f14344f8944f7 /fs/btrfs/scrub.c
parent79d2d21ee06f3634423d1a45fb6ddfcae59061fd (diff)
parent8a5daf1e2c199746767d94b4036638ba11d528b3 (diff)
downloadlinux-582076ab16779208e7eb6ce712a9c0a6cc5bafe4.tar.bz2
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/scrub.c')
0 files changed, 0 insertions, 0 deletions