diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-20 20:24:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-20 20:24:13 +0100 |
| commit | d96d875ef5dd372f533059a44f98e92de9cf0d42 (patch) | |
| tree | 65ef685b91b5b96272d8e9acc2aa830ac86589fd /fs | |
| parent | Linux 5.5-rc7 (diff) | |
| parent | reiserfs: fix handling of -EOPNOTSUPP in reiserfs_for_each_xattr (diff) | |
| download | linux-d96d875ef5dd372f533059a44f98e92de9cf0d42.tar.xz linux-d96d875ef5dd372f533059a44f98e92de9cf0d42.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/reiserfs/xattr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 62b40df36c98..28b241cd6987 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -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; } |