Merge tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs (2e2c1220) · Commits · 戴 / test

fs/ubifs/sb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -748,7 +748,7 @@ int ubifs_read_superblock(struct ubifs_info *c)
		goto out;
		}

		if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION) && c->encrypted) {
		if (!IS_ENABLED(CONFIG_FS_ENCRYPTION) && c->encrypted) {
		ubifs_err(c, "file system contains encrypted files but UBIFS"
		" was built without crypto support.");
		err = -EINVAL;
		@@ -941,7 +941,7 @@ int ubifs_enable_encryption(struct ubifs_info *c)
		int err;
		struct ubifs_sb_node *sup = c->sup_node;

		if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION))
		if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
		return -EOPNOTSUPP;

		if (c->encrypted)

+5 −1

Original line number	Diff line number	Diff line
		@@ -2015,13 +2015,17 @@ int ubifs_xattr_set(struct inode host, const char name, const void *value,
		size_t size, int flags, bool check_lock);
		ssize_t ubifs_xattr_get(struct inode host, const char name, void *buf,
		size_t size);
		int ubifs_purge_xattrs(struct inode *host);

		#ifdef CONFIG_UBIFS_FS_XATTR
		void ubifs_evict_xattr_inode(struct ubifs_info *c, ino_t xattr_inum);
		int ubifs_purge_xattrs(struct inode *host);
		#else
		static inline void ubifs_evict_xattr_inode(struct ubifs_info *c,
		ino_t xattr_inum) { }
		static inline int ubifs_purge_xattrs(struct inode *host)
		{
		return 0;
		}
		#endif

		#ifdef CONFIG_UBIFS_FS_SECURITY

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",