diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-29 13:31:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-29 13:31:47 -0800 |
| commit | d1de762e36375e1e1cd41f7f93c298ac62d831a7 (patch) | |
| tree | 09f8da8ec2a383a45e6a166e5ddb103dba1c1597 /drivers/mtd/ubi/fastmap-wl.c | |
| parent | 0a4b6e2f80aad46fb55a5cf7b1664c0aef030ee0 (diff) | |
| parent | 7f29ae9f977bcdc3654e68bc36d170223c52fd48 (diff) | |
| download | linux-d1de762e36375e1e1cd41f7f93c298ac62d831a7.tar.gz linux-d1de762e36375e1e1cd41f7f93c298ac62d831a7.tar.bz2 linux-d1de762e36375e1e1cd41f7f93c298ac62d831a7.zip | |
Merge tag 'upstream-4.16-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS updates from Richard Weinberger:
- use the new fscrypt APIs
- a fix for a Fastmap issue
- other minor bug fixes
* tag 'upstream-4.16-rc1' of git://git.infradead.org/linux-ubifs:
ubi: block: Fix locking for idr_alloc/idr_remove
mtd: ubi: wl: Fix error return code in ubi_wl_init()
ubi: Fix copy/paste error in function documentation
ubi: Fastmap: Fix typo
ubifs: remove error message in ubifs_xattr_get
ubi: fastmap: Erase outdated anchor PEBs during attach
ubifs: switch to fscrypt_prepare_setattr()
ubifs: switch to fscrypt_prepare_lookup()
ubifs: switch to fscrypt_prepare_rename()
ubifs: switch to fscrypt_prepare_link()
ubifs: switch to fscrypt_file_open()
ubi: fastmap: Clean up the initialization of pointer p
ubi: fastmap: Use kmem_cache_free to deallocate memory
ubi: Fix race condition between ubi volume creation and udev
mtd: ubi: Use 'max_bad_blocks' to compute bad_peb_limit if available
ubifs: Fix uninitialized variable in search_dh_cookie()
Diffstat (limited to 'drivers/mtd/ubi/fastmap-wl.c')
| -rw-r--r-- | drivers/mtd/ubi/fastmap-wl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c index 4f0bd6b4422a..590d967011bb 100644 --- a/drivers/mtd/ubi/fastmap-wl.c +++ b/drivers/mtd/ubi/fastmap-wl.c @@ -66,7 +66,7 @@ static void return_unused_pool_pebs(struct ubi_device *ubi, } } -static int anchor_pebs_avalible(struct rb_root *root) +static int anchor_pebs_available(struct rb_root *root) { struct rb_node *p; struct ubi_wl_entry *e; |