Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d28d6079 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Greg Kroah-Hartman
Browse files

reiserfs: fix handling of -EOPNOTSUPP in reiserfs_for_each_xattr 

commit 394440d469413fa9b74f88a11f144d76017221f2 upstream.

Commit 60e4cf67a58 (reiserfs: fix extended attributes on the root
directory) introduced a regression open_xa_root started returning
-EOPNOTSUPP but it was not handled properly in reiserfs_for_each_xattr.

When the reiserfs module is built without CONFIG_REISERFS_FS_XATTR,
deleting an inode would result in a warning and chowning an inode
would also result in a warning and then fail to complete.

With CONFIG_REISERFS_FS_XATTR enabled, the xattr root would always be
present for read-write operations.

This commit handles -EOPNOSUPP in the same way -ENODATA is handled.

Fixes: 60e4cf67a582 ("reiserfs: fix extended attributes on the root directory")
CC: stable@vger.kernel.org	# Commit 60e4cf67a58 was picked up by stable
Link: https://lore.kernel.org/r/20200115180059.6935-1-jeffm@suse.com


Reported-by: default avatarMichael Brunnbauer <brunni@netestate.de>
Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b88ac50

fs/reiserfs/xattr.c

+6 −2
Original line number Diff line number Diff line
@@ -319,8 +319,12 @@ static int reiserfs_for_each_xattr(struct inode *inode, 
out_dir:

	dput(dir);

out:

	/* -ENODATA isn't an error */

	if (err == -ENODATA)

	/*

	 * -ENODATA: this object doesn't have any xattrs

	 * -EOPNOTSUPP: this file system doesn't have xattrs enabled on disk.

	 * Neither are errors

	 */

	if (err == -ENODATA || err == -EOPNOTSUPP)

		err = 0;

	return err;

}