From 8d8a09b093d7073465c824f74caf315c073d3875 Mon Sep 17 00:00:00 2001 From: Gao Xiang Date: Fri, 30 Aug 2019 00:38:27 +0800 Subject: 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 Signed-off-by: Gao Xiang Link: https://lore.kernel.org/r/20190829163827.203274-1-gaoxiang25@huawei.com Signed-off-by: Greg Kroah-Hartman --- fs/erofs/inode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fs/erofs/inode.c') diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index 80f4fe919ee7..e7c190cf101a 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -18,7 +18,7 @@ static int read_inode(struct inode *inode, void *data) vi->datamode = __inode_data_mapping(advise); - if (unlikely(vi->datamode >= EROFS_INODE_LAYOUT_MAX)) { + if (vi->datamode >= EROFS_INODE_LAYOUT_MAX) { errln("unsupported data mapping %u of nid %llu", vi->datamode, vi->nid); DBG_BUGON(1); @@ -133,13 +133,13 @@ static int fill_inline_data(struct inode *inode, void *data, if (S_ISLNK(inode->i_mode) && inode->i_size < PAGE_SIZE) { char *lnk = erofs_kmalloc(sbi, inode->i_size + 1, GFP_KERNEL); - if (unlikely(!lnk)) + if (!lnk) return -ENOMEM; m_pofs += vi->inode_isize + vi->xattr_isize; /* inline symlink data shouldn't across page boundary as well */ - if (unlikely(m_pofs + inode->i_size > PAGE_SIZE)) { + if (m_pofs + inode->i_size > PAGE_SIZE) { kfree(lnk); errln("inline data cross block boundary @ nid %llu", vi->nid); @@ -268,7 +268,7 @@ struct inode *erofs_iget(struct super_block *sb, { struct inode *inode = erofs_iget_locked(sb, nid); - if (unlikely(!inode)) + if (!inode) return ERR_PTR(-ENOMEM); if (inode->i_state & I_NEW) { @@ -278,7 +278,7 @@ struct inode *erofs_iget(struct super_block *sb, vi->nid = nid; err = fill_inode(inode, isdir); - if (likely(!err)) + if (!err) unlock_new_inode(inode); else { iget_failed(inode); -- cgit v1.2.3