diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-19 15:22:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-19 15:22:03 -0700 |
commit | 2e2c12200153e63749f836109cef8150f9c61ed8 (patch) | |
tree | 0648d6b6a06449c1e6f793a0001cd4908ad8a603 /fs/ubifs/xattr.c | |
parent | cb6f8739fbf98203d0fb0bc2c2dbbec0ddfe978a (diff) | |
parent | 4dd0481584d09221849ac8a3af4cd3cefd58c11e (diff) | |
download | linux-stable-2e2c12200153e63749f836109cef8150f9c61ed8.tar.gz linux-stable-2e2c12200153e63749f836109cef8150f9c61ed8.tar.bz2 linux-stable-2e2c12200153e63749f836109cef8150f9c61ed8.zip |
Merge tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull UBIFS fixes from Richard Weinberger:
- build errors wrt xattrs
- mismerge which lead to a wrong Kconfig ifdef
- missing endianness conversion
* tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
ubifs: Convert xattr inum to host order
ubifs: Use correct config name for encryption
ubifs: Fix build error without CONFIG_UBIFS_FS_XATTR
Diffstat (limited to 'fs/ubifs/xattr.c')
-rw-r--r-- | fs/ubifs/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index acab3181ab35..bcfed27e8997 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c @@ -527,7 +527,7 @@ int ubifs_purge_xattrs(struct inode *host) fname_name(&nm) = xent->name; fname_len(&nm) = le16_to_cpu(xent->nlen); - xino = ubifs_iget(c->vfs_sb, xent->inum); + xino = ubifs_iget(c->vfs_sb, le64_to_cpu(xent->inum)); if (IS_ERR(xino)) { err = PTR_ERR(xino); ubifs_err(c, "dead directory entry '%s', error %d", |