diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 13:58:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 13:58:11 -0400 |
| commit | e77295dc9e6b52281ae85af4068f13752524e9f4 (patch) | |
| tree | fca6b723f6c91f2af79b28f05c05e114720fbe66 /include | |
| parent | 1136cf11066a32d4ac2a476dac302858d763703d (diff) | |
| parent | 91b80969ba466ba4b915a4a1d03add8c297add3f (diff) | |
Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
nfsd: fix buffer overrun decoding NFSv4 acl
sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports
nfsd: fix compound state allocation error handling
svcrdma: Fix race between svc_rdma_recvfrom thread and the dto_tasklet
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sunrpc/svc_rdma.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h index ef2e3a20bf3b..dc05b54bd3a3 100644 --- a/include/linux/sunrpc/svc_rdma.h +++ b/include/linux/sunrpc/svc_rdma.h | |||
| @@ -143,7 +143,6 @@ struct svcxprt_rdma { | |||
| 143 | unsigned long sc_flags; | 143 | unsigned long sc_flags; |
| 144 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ | 144 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ |
| 145 | struct list_head sc_read_complete_q; | 145 | struct list_head sc_read_complete_q; |
| 146 | spinlock_t sc_read_complete_lock; | ||
| 147 | struct work_struct sc_work; | 146 | struct work_struct sc_work; |
| 148 | }; | 147 | }; |
| 149 | /* sc_flags */ | 148 | /* sc_flags */ |