diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 02:39:34 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 02:39:34 +0300 |
commit | 77cb51e65df0010cb22169bcbb6ea1b4f21da7e0 (patch) | |
tree | 0ed38a1edb87fb612e86331e9f93b0b4413001f3 /fs/ubifs/find.c | |
parent | 375479c38689fbc403cf57b2999278615a4163f5 (diff) | |
parent | b5094b7f135be34630e3ea8a98fa215715d0f29d (diff) | |
download | linux-77cb51e65df0010cb22169bcbb6ea1b4f21da7e0.tar.xz |
Merge tag 'tags/upstream-4.17-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI and UBIFS updates from Richard Weinberger:
"Minor bug fixes and improvements"
* tag 'tags/upstream-4.17-rc1' of git://git.infradead.org/linux-ubifs:
ubi: Reject MLC NAND
ubifs: Remove useless parameter of lpt_heap_replace
ubifs: Constify struct ubifs_lprops in scan_for_leb_for_idx
ubifs: remove unnecessary assignment
ubi: Fix error for write access
ubi: fastmap: Don't flush fastmap work on detach
ubifs: Check ubifs_wbuf_sync() return code
Diffstat (limited to 'fs/ubifs/find.c')
-rw-r--r-- | fs/ubifs/find.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c index 2dcf3d473fec..9571616b5dda 100644 --- a/fs/ubifs/find.c +++ b/fs/ubifs/find.c @@ -632,7 +632,7 @@ static int scan_for_idx_cb(struct ubifs_info *c, */ static const struct ubifs_lprops *scan_for_leb_for_idx(struct ubifs_info *c) { - struct ubifs_lprops *lprops; + const struct ubifs_lprops *lprops; struct scan_data data; int err; |