Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-4
+2
-2
fs/ubifs/sb.c
+2
-2
fs/ubifs/sb.c
···
748
748
goto out;
749
749
}
750
750
751
-
if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION) && c->encrypted) {
751
+
if (!IS_ENABLED(CONFIG_FS_ENCRYPTION) && c->encrypted) {
752
752
ubifs_err(c, "file system contains encrypted files but UBIFS"
753
753
" was built without crypto support.");
754
754
err = -EINVAL;
···
941
941
int err;
942
942
struct ubifs_sb_node *sup = c->sup_node;
943
943
944
-
if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION))
944
+
if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
945
945
return -EOPNOTSUPP;
946
946
947
947
if (c->encrypted)
+5
-1
fs/ubifs/ubifs.h
+5
-1
fs/ubifs/ubifs.h
···
2015
2015
size_t size, int flags, bool check_lock);
2016
2016
ssize_t ubifs_xattr_get(struct inode *host, const char *name, void *buf,
2017
2017
size_t size);
2018
-
int ubifs_purge_xattrs(struct inode *host);
2019
2018
2020
2019
#ifdef CONFIG_UBIFS_FS_XATTR
2021
2020
void ubifs_evict_xattr_inode(struct ubifs_info *c, ino_t xattr_inum);
2021
+
int ubifs_purge_xattrs(struct inode *host);
2022
2022
#else
2023
2023
static inline void ubifs_evict_xattr_inode(struct ubifs_info *c,
2024
2024
ino_t xattr_inum) { }
2025
+
static inline int ubifs_purge_xattrs(struct inode *host)
2026
+
{
2027
+
return 0;
2028
+
}
2025
2029
#endif
2026
2030
2027
2031
#ifdef CONFIG_UBIFS_FS_SECURITY
+1
-1
fs/ubifs/xattr.c
+1
-1
fs/ubifs/xattr.c
···
527
527
fname_name(&nm) = xent->name;
528
528
fname_len(&nm) = le16_to_cpu(xent->nlen);
529
529
530
-
xino = ubifs_iget(c->vfs_sb, xent->inum);
530
+
xino = ubifs_iget(c->vfs_sb, le64_to_cpu(xent->inum));
531
531
if (IS_ERR(xino)) {
532
532
err = PTR_ERR(xino);
533
533
ubifs_err(c, "dead directory entry '%s', error %d",