Commit d96d875e authored by Linus Torvalds's avatar Linus Torvalds

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
parents def9d278 394440d4
...@@ -319,8 +319,12 @@ static int reiserfs_for_each_xattr(struct inode *inode, ...@@ -319,8 +319,12 @@ static int reiserfs_for_each_xattr(struct inode *inode,
out_dir: out_dir:
dput(dir); dput(dir);
out: 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; err = 0;
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment