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/zmap.c | |
| parent | 5cf89673645f7edfa075afc9e1d531db24706329 (diff) | |
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/zmap.c')
| -rw-r--r-- | fs/erofs/zmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c index 4dc9cec01297..850e0e3d57a8 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -348,7 +348,7 @@ static int vle_extent_lookback(struct z_erofs_maprecorder *m, switch (m->type) { case Z_EROFS_VLE_CLUSTER_TYPE_NONHEAD: - if (unlikely(!m->delta[0])) { + if (!m->delta[0]) { errln("invalid lookback distance 0 at nid %llu", vi->nid); DBG_BUGON(1); @@ -386,7 +386,7 @@ int z_erofs_map_blocks_iter(struct inode *inode, trace_z_erofs_map_blocks_iter_enter(inode, map, flags); /* when trying to read beyond EOF, leave it unmapped */ - if (unlikely(map->m_la >= inode->i_size)) { + if (map->m_la >= inode->i_size) { map->m_llen = map->m_la + 1 - inode->i_size; map->m_la = inode->i_size; map->m_flags = 0; @@ -420,7 +420,7 @@ int z_erofs_map_blocks_iter(struct inode *inode, break; } /* m.lcn should be >= 1 if endoff < m.clusterofs */ - if (unlikely(!m.lcn)) { + if (!m.lcn) { errln("invalid logical cluster 0 at nid %llu", vi->nid); err = -EFSCORRUPTED; @@ -433,7 +433,7 @@ int z_erofs_map_blocks_iter(struct inode *inode, case Z_EROFS_VLE_CLUSTER_TYPE_NONHEAD: /* get the correspoinding first chunk */ err = vle_extent_lookback(&m, m.delta[0]); - if (unlikely(err)) + if (err) goto unmap_out; break; default: |