diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /include/scsi/libiscsi_tcp.h | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'include/scsi/libiscsi_tcp.h')
| -rw-r--r-- | include/scsi/libiscsi_tcp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/libiscsi_tcp.h b/include/scsi/libiscsi_tcp.h index 741ae7ed4394..e6b9fd2eea34 100644 --- a/include/scsi/libiscsi_tcp.h +++ b/include/scsi/libiscsi_tcp.h | |||
| @@ -47,6 +47,7 @@ struct iscsi_segment { | |||
| 47 | struct scatterlist *sg; | 47 | struct scatterlist *sg; |
| 48 | void *sg_mapped; | 48 | void *sg_mapped; |
| 49 | unsigned int sg_offset; | 49 | unsigned int sg_offset; |
| 50 | bool atomic_mapped; | ||
| 50 | 51 | ||
| 51 | iscsi_segment_done_fn_t *done; | 52 | iscsi_segment_done_fn_t *done; |
| 52 | }; | 53 | }; |