Skip to content

Commit d96d875

Browse files
committed
Merge tag 'fixes_for_v5.5-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull reiserfs fix from Jan Kara: "A fixup of a recently merged reiserfs fix which has caused problem when xattrs were not compiled in" * tag 'fixes_for_v5.5-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: reiserfs: fix handling of -EOPNOTSUPP in reiserfs_for_each_xattr
2 parents def9d27 + 394440d commit d96d875

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

fs/reiserfs/xattr.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,12 @@ static int reiserfs_for_each_xattr(struct inode *inode,
319319
out_dir:
320320
dput(dir);
321321
out:
322-
/* -ENODATA isn't an error */
323-
if (err == -ENODATA)
322+
/*
323+
* -ENODATA: this object doesn't have any xattrs
324+
* -EOPNOTSUPP: this file system doesn't have xattrs enabled on disk.
325+
* Neither are errors
326+
*/
327+
if (err == -ENODATA || err == -EOPNOTSUPP)
324328
err = 0;
325329
return err;
326330
}

0 commit comments

Comments
 (0)