diff options
| author | Linus Torvalds | 2016-05-28 03:49:29 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-28 03:49:29 +0200 |
| commit | 23a3e178b9f8be3a900c7b11d795e54b4a131af0 (patch) | |
| tree | 36555d6da836a1df9918313d2a1cbefba3ca2123 /drivers/mtd/ubi/ubi.h | |
| parent | nfs: fix anonymous member initializer build failure with older compilers (diff) | |
| parent | ubifs: ubifs_dump_inode: Fix dumping field bulk_read (diff) | |
| download | kernel-qcow2-linux-23a3e178b9f8be3a900c7b11d795e54b4a131af0.tar.gz kernel-qcow2-linux-23a3e178b9f8be3a900c7b11d795e54b4a131af0.tar.xz kernel-qcow2-linux-23a3e178b9f8be3a900c7b11d795e54b4a131af0.zip | |
Merge tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS updates from Richard Weinberger:
"This contains mostly cleanups and minor improvements of UBI and UBIFS"
* tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs:
ubifs: ubifs_dump_inode: Fix dumping field bulk_read
UBI: Fix static volume checks when Fastmap is used
UBI: Set free_count to zero before walking through erase list
UBI: Silence an unintialized variable warning
UBI: Clean up return in ubi_remove_volume()
UBI: Modify wrong comment in ubi_leb_map function.
UBI: Don't read back all data in ubi_eba_copy_leb()
UBI: Add ro-mode sysfs attribute
Diffstat (limited to 'drivers/mtd/ubi/ubi.h')
| -rw-r--r-- | drivers/mtd/ubi/ubi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index dadc6a9d5755..61d4e99755a4 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h @@ -466,6 +466,7 @@ struct ubi_debug_info { * @fm_eba_sem: allows ubi_update_fastmap() to block EBA table changes * @fm_work: fastmap work queue * @fm_work_scheduled: non-zero if fastmap work was scheduled + * @fast_attach: non-zero if UBI was attached by fastmap * * @used: RB-tree of used physical eraseblocks * @erroneous: RB-tree of erroneous used physical eraseblocks @@ -574,6 +575,7 @@ struct ubi_device { size_t fm_size; struct work_struct fm_work; int fm_work_scheduled; + int fast_attach; /* Wear-leveling sub-system's stuff */ struct rb_root used; |