diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2020-03-29 02:33:43 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-04-02 00:29:06 +0300 |
| commit | 54d3adbc29f0c7c53890da1683e629cd220d7201 (patch) | |
| tree | 485a4098e4523ed56c97b308c324f8cf91e5a51f /fs/ext4/inline.c | |
| parent | df41460a21b06a76437af040d90ccee03888e8e5 (diff) | |
| download | linux-54d3adbc29f0c7c53890da1683e629cd220d7201.tar.xz | |
ext4: save all error info in save_error_info() and drop ext4_set_errno()
Using a separate function, ext4_set_errno() to set the errno is
problematic because it doesn't do the right thing once
s_last_error_errorcode is non-zero. It's also less racy to set all of
the error information all at once. (Also, as a bonus, it shrinks code
size slightly.)
Link: https://lore.kernel.org/r/20200329020404.686965-1-tytso@mit.edu
Fixes: 878520ac45f9 ("ext4: save the error code which triggered...")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inline.c')
| -rw-r--r-- | fs/ext4/inline.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index e7db6ee23277..f35e289e17aa 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -98,10 +98,9 @@ int ext4_get_max_inline_size(struct inode *inode) error = ext4_get_inode_loc(inode, &iloc); if (error) { - ext4_set_errno(inode->i_sb, -error); - ext4_error_inode(inode, __func__, __LINE__, 0, - "can't get inode location %lu", - inode->i_ino); + ext4_error_inode_err(inode, __func__, __LINE__, 0, -error, + "can't get inode location %lu", + inode->i_ino); return 0; } @@ -1762,9 +1761,9 @@ bool empty_inline_dir(struct inode *dir, int *has_inline_data) err = ext4_get_inode_loc(dir, &iloc); if (err) { - ext4_set_errno(dir->i_sb, -err); - EXT4_ERROR_INODE(dir, "error %d getting inode %lu block", - err, dir->i_ino); + EXT4_ERROR_INODE_ERR(dir, -err, + "error %d getting inode %lu block", + err, dir->i_ino); return true; } |