[GIT PULL] UBIFS fixes for 4.10-rc5
From: Richard Weinberger
Date: Wed Jan 18 2017 - 16:52:14 EST
Linus,
The following changes since commit 5cf7a0f3442b2312326c39f571d637669a478235:
Merge tag 'nfs-for-4.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (2017-01-16 12:15:59 -0800)
are available in the git repository at:
git://git.infradead.org/linux-ubifs.git tags/upstream-4.10-rc5
for you to fetch changes up to 1cb51a15b576ee325d527726afff40947218fd5e:
ubifs: Fix journal replay wrt. xattr nodes (2017-01-17 14:35:58 +0100)
----------------------------------------------------------------
This pull request contains fixes for UBIFS:
- A long standing issue in UBIFS journal replay code
- Fallout from the merge window
----------------------------------------------------------------
Arnd Bergmann (1):
ubifs: add CONFIG_BLOCK dependency for encryption
Colin Ian King (1):
ubifs: ensure zero err is returned on successful return
Eric Biggers (2):
ubifs: allow encryption ioctls in compat mode
ubifs: remove redundant checks for encryption key
Peter Rosin (1):
ubifs: fix unencrypted journal write
Richard Weinberger (1):
ubifs: Fix journal replay wrt. xattr nodes
fs/ubifs/Kconfig | 2 +-
fs/ubifs/dir.c | 58 +++---------------------------------------------------
fs/ubifs/ioctl.c | 3 +++
fs/ubifs/journal.c | 2 ++
fs/ubifs/tnc.c | 25 +++++++++++++++++++++--
5 files changed, 32 insertions(+), 58 deletions(-)