erofs: reduntant assignment in __erofs_get_meta_page()
authorGao Xiang <gaoxiang25@huawei.com>
Thu, 29 Aug 2019 17:17:41 +0000 (01:17 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Aug 2019 07:02:10 +0000 (09:02 +0200)
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>
fs/erofs/data.c

index 0f2f1a8..0983807 100644 (file)
@@ -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;
                }