Signed-off-by: Alexander Morozov <lk4d4@docker.com>
| ... | ... |
@@ -45,15 +45,15 @@ type Transaction struct {
|
| 45 | 45 |
} |
| 46 | 46 |
|
| 47 | 47 |
type DevInfo struct {
|
| 48 |
- Hash string `json:"-"` |
|
| 49 |
- DeviceId int `json:"device_id"` |
|
| 50 |
- Size uint64 `json:"size"` |
|
| 51 |
- TransactionId uint64 `json:"transaction_id"` |
|
| 52 |
- Initialized bool `json:"initialized"` |
|
| 53 |
- devices *DeviceSet `json:"-"` |
|
| 48 |
+ Hash string `json:"-"` |
|
| 49 |
+ DeviceId int `json:"device_id"` |
|
| 50 |
+ Size uint64 `json:"size"` |
|
| 51 |
+ TransactionId uint64 `json:"transaction_id"` |
|
| 52 |
+ Initialized bool `json:"initialized"` |
|
| 53 |
+ devices *DeviceSet |
|
| 54 | 54 |
|
| 55 |
- mountCount int `json:"-"` |
|
| 56 |
- mountPath string `json:"-"` |
|
| 55 |
+ mountCount int |
|
| 56 |
+ mountPath string |
|
| 57 | 57 |
|
| 58 | 58 |
// The global DeviceSet lock guarantees that we serialize all |
| 59 | 59 |
// the calls to libdevmapper (which is not threadsafe), but we |
| ... | ... |
@@ -65,12 +65,12 @@ type DevInfo struct {
|
| 65 | 65 |
// the global lock while holding the per-device locks all |
| 66 | 66 |
// device locks must be aquired *before* the device lock, and |
| 67 | 67 |
// multiple device locks should be aquired parent before child. |
| 68 |
- lock sync.Mutex `json:"-"` |
|
| 68 |
+ lock sync.Mutex |
|
| 69 | 69 |
} |
| 70 | 70 |
|
| 71 | 71 |
type MetaData struct {
|
| 72 | 72 |
Devices map[string]*DevInfo `json:"Devices"` |
| 73 |
- devicesLock sync.Mutex `json:"-"` // Protects all read/writes to Devices map |
|
| 73 |
+ devicesLock sync.Mutex // Protects all read/writes to Devices map |
|
| 74 | 74 |
} |
| 75 | 75 |
|
| 76 | 76 |
type DeviceSet struct {
|