diff options
author | Gao Xiang <gaoxiang25@huawei.com> | 2019-08-30 00:38:27 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-30 09:02:02 +0200 |
commit | 8d8a09b093d7073465c824f74caf315c073d3875 (patch) | |
tree | 787aaad384401dd763dc4541684055b88563c1bc /fs/erofs/internal.h | |
parent | 5cf89673645f7edfa075afc9e1d531db24706329 (diff) | |
download | linux-8d8a09b093d7073465c824f74caf315c073d3875.tar.bz2 |
erofs: remove all likely/unlikely annotations
As Dan Carpenter suggested [1], I have to remove
all erofs likely/unlikely annotations.
[1] https://lore.kernel.org/linux-fsdevel/20190829154346.GK23584@kadam/
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Link: https://lore.kernel.org/r/20190829163827.203274-1-gaoxiang25@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/erofs/internal.h')
-rw-r--r-- | fs/erofs/internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 620b73fcc416..141ea424587d 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -424,7 +424,7 @@ static inline struct bio *erofs_grab_bio(struct super_block *sb, do { if (nr_pages == 1) { bio = bio_alloc(gfp | (nofail ? __GFP_NOFAIL : 0), 1); - if (unlikely(!bio)) { + if (!bio) { DBG_BUGON(nofail); return ERR_PTR(-ENOMEM); } @@ -432,7 +432,7 @@ static inline struct bio *erofs_grab_bio(struct super_block *sb, } bio = bio_alloc(gfp, nr_pages); nr_pages /= 2; - } while (unlikely(!bio)); + } while (!bio); bio->bi_end_io = endio; bio_set_dev(bio, sb->s_bdev); |