diff options
Diffstat (limited to 'drivers/mtd/ubi/ubi.h')
-rw-r--r-- | drivers/mtd/ubi/ubi.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index 3cf1aa1a0240..90cdcad83cbb 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h | |||
@@ -144,7 +144,6 @@ struct ubi_volume_desc; | |||
144 | * @readers: number of users holding this volume in read-only mode | 144 | * @readers: number of users holding this volume in read-only mode |
145 | * @writers: number of users holding this volume in read-write mode | 145 | * @writers: number of users holding this volume in read-write mode |
146 | * @exclusive: whether somebody holds this volume in exclusive mode | 146 | * @exclusive: whether somebody holds this volume in exclusive mode |
147 | * @checked: if this static volume was checked | ||
148 | * | 147 | * |
149 | * @reserved_pebs: how many physical eraseblocks are reserved for this volume | 148 | * @reserved_pebs: how many physical eraseblocks are reserved for this volume |
150 | * @vol_type: volume type (%UBI_DYNAMIC_VOLUME or %UBI_STATIC_VOLUME) | 149 | * @vol_type: volume type (%UBI_DYNAMIC_VOLUME or %UBI_STATIC_VOLUME) |
@@ -152,21 +151,22 @@ struct ubi_volume_desc; | |||
152 | * @used_ebs: how many logical eraseblocks in this volume contain data | 151 | * @used_ebs: how many logical eraseblocks in this volume contain data |
153 | * @last_eb_bytes: how many bytes are stored in the last logical eraseblock | 152 | * @last_eb_bytes: how many bytes are stored in the last logical eraseblock |
154 | * @used_bytes: how many bytes of data this volume contains | 153 | * @used_bytes: how many bytes of data this volume contains |
155 | * @upd_marker: non-zero if the update marker is set for this volume | ||
156 | * @corrupted: non-zero if the volume is corrupted (static volumes only) | ||
157 | * @alignment: volume alignment | 154 | * @alignment: volume alignment |
158 | * @data_pad: how many bytes are not used at the end of physical eraseblocks to | 155 | * @data_pad: how many bytes are not used at the end of physical eraseblocks to |
159 | * satisfy the requested alignment | 156 | * satisfy the requested alignment |
160 | * @name_len: volume name length | 157 | * @name_len: volume name length |
161 | * @name: volume name | 158 | * @name: volume name |
162 | * | 159 | * |
163 | * @updating: whether the volume is being updated | ||
164 | * @upd_ebs: how many eraseblocks are expected to be updated | 160 | * @upd_ebs: how many eraseblocks are expected to be updated |
165 | * @upd_bytes: how many bytes are expected to be received | 161 | * @upd_bytes: how many bytes are expected to be received |
166 | * @upd_received: how many update bytes were already received | 162 | * @upd_received: how many update bytes were already received |
167 | * @upd_buf: update buffer which is used to collect update data | 163 | * @upd_buf: update buffer which is used to collect update data |
168 | * | 164 | * |
169 | * @eba_tbl: EBA table of this volume (LEB->PEB mapping) | 165 | * @eba_tbl: EBA table of this volume (LEB->PEB mapping) |
166 | * @checked: %1 if this static volume was checked | ||
167 | * @corrupted: %1 if the volume is corrupted (static volumes only) | ||
168 | * @upd_marker: %1 if the update marker is set for this volume | ||
169 | * @updating: %1 if the volume is being updated | ||
170 | * | 170 | * |
171 | * @gluebi_desc: gluebi UBI volume descriptor | 171 | * @gluebi_desc: gluebi UBI volume descriptor |
172 | * @gluebi_refcount: reference count of the gluebi MTD device | 172 | * @gluebi_refcount: reference count of the gluebi MTD device |
@@ -189,7 +189,6 @@ struct ubi_volume { | |||
189 | int readers; | 189 | int readers; |
190 | int writers; | 190 | int writers; |
191 | int exclusive; | 191 | int exclusive; |
192 | int checked; | ||
193 | 192 | ||
194 | int reserved_pebs; | 193 | int reserved_pebs; |
195 | int vol_type; | 194 | int vol_type; |
@@ -197,20 +196,21 @@ struct ubi_volume { | |||
197 | int used_ebs; | 196 | int used_ebs; |
198 | int last_eb_bytes; | 197 | int last_eb_bytes; |
199 | long long used_bytes; | 198 | long long used_bytes; |
200 | int upd_marker; | ||
201 | int corrupted; | ||
202 | int alignment; | 199 | int alignment; |
203 | int data_pad; | 200 | int data_pad; |
204 | int name_len; | 201 | int name_len; |
205 | char name[UBI_VOL_NAME_MAX+1]; | 202 | char name[UBI_VOL_NAME_MAX+1]; |
206 | 203 | ||
207 | int updating; | ||
208 | int upd_ebs; | 204 | int upd_ebs; |
209 | long long upd_bytes; | 205 | long long upd_bytes; |
210 | long long upd_received; | 206 | long long upd_received; |
211 | void *upd_buf; | 207 | void *upd_buf; |
212 | 208 | ||
213 | int *eba_tbl; | 209 | int *eba_tbl; |
210 | int checked:1; | ||
211 | int corrupted:1; | ||
212 | int upd_marker:1; | ||
213 | int updating:1; | ||
214 | 214 | ||
215 | #ifdef CONFIG_MTD_UBI_GLUEBI | 215 | #ifdef CONFIG_MTD_UBI_GLUEBI |
216 | /* Gluebi-related stuff may be compiled out */ | 216 | /* Gluebi-related stuff may be compiled out */ |