diff options
| author | Gao Xiang <gaoxiang25@huawei.com> | 2019-08-29 19:17:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-30 09:02:10 +0200 |
| commit | 097a802ae15e2c6d17256a6fe0712a655ba10823 (patch) | |
| tree | 880a9dc3a415d9018099694e7f996fe676039add /fs/erofs | |
| parent | erofs: remove all likely/unlikely annotations (diff) | |
| download | linux-097a802ae15e2c6d17256a6fe0712a655ba10823.tar.xz linux-097a802ae15e2c6d17256a6fe0712a655ba10823.zip | |
erofs: reduntant assignment in __erofs_get_meta_page()
As Joe Perches suggested [1],
err = bio_add_page(bio, page, PAGE_SIZE, 0);
- if (unlikely(err != PAGE_SIZE)) {
+ if (err != PAGE_SIZE) {
err = -EFAULT;
goto err_out;
}
The initial assignment to err is odd as it's not
actually an error value -E<FOO> but a int size
from a unsigned int len.
Here the return is either 0 or PAGE_SIZE.
This would be more legible to me as:
if (bio_add_page(bio, page, PAGE_SIZE, 0) != PAGE_SIZE) {
err = -EFAULT;
goto err_out;
}
[1] https://lore.kernel.org/r/74c4784319b40deabfbaea92468f7e3ef44f1c96.camel@perches.com/
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Link: https://lore.kernel.org/r/20190829171741.225219-1-gaoxiang25@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/erofs')
| -rw-r--r-- | fs/erofs/data.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 0f2f1a839372..0983807737fd 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -69,8 +69,7 @@ repeat: goto err_out; } - err = bio_add_page(bio, page, PAGE_SIZE, 0); - if (err != PAGE_SIZE) { + if (bio_add_page(bio, page, PAGE_SIZE, 0) != PAGE_SIZE) { err = -EFAULT; goto err_out; } |