diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-14 17:24:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-14 17:24:12 -0700 |
| commit | a318423b61e8c67aa5c0a428540c58439a20baac (patch) | |
| tree | 5834b93378b01bde412c49aacdb7aa1021c701ca /fs/ubifs/log.c | |
| parent | f2772a0e4833d1af1901b6f1a38136fb71d1350c (diff) | |
| parent | 8009ce956c3d28022af6b122e50213ad830fc902 (diff) | |
| download | lwn-a318423b61e8c67aa5c0a428540c58439a20baac.tar.gz lwn-a318423b61e8c67aa5c0a428540c58439a20baac.zip | |
Merge tag 'upstream-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull UBIFS updates from Richard Weinberger:
- Support for zstd compression
- Support for offline signed filesystems
- Various fixes for regressions
* tag 'upstream-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
ubifs: Don't leak orphans on memory during commit
ubifs: Check link count of inodes when killing orphans.
ubifs: Add support for zstd compression.
ubifs: support offline signed images
ubifs: remove unnecessary check in ubifs_log_start_commit
ubifs: Fix typo of output in get_cs_sqnum
ubifs: Simplify redundant code
ubifs: Correctly use tnc_next() in search_dh_cookie()
Diffstat (limited to 'fs/ubifs/log.c')
| -rw-r--r-- | fs/ubifs/log.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c index cd85d7d4c515..b6ac9c4281ef 100644 --- a/fs/ubifs/log.c +++ b/fs/ubifs/log.c @@ -438,10 +438,7 @@ int ubifs_log_start_commit(struct ubifs_info *c, int *ltail_lnum) *ltail_lnum = c->lhead_lnum; c->lhead_offs += len; - if (c->lhead_offs == c->leb_size) { - c->lhead_lnum = ubifs_next_log_lnum(c, c->lhead_lnum); - c->lhead_offs = 0; - } + ubifs_assert(c, c->lhead_offs < c->leb_size); remove_buds(c); |