]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
fs: cifs: Drop unlikely before IS_ERR(_OR_NULL)
authorKefeng Wang <wangkefeng.wang@huawei.com>
Wed, 5 Jun 2019 14:24:25 +0000 (22:24 +0800)
committerSteve French <stfrench@microsoft.com>
Mon, 8 Jul 2019 03:37:42 +0000 (22:37 -0500)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag,
so no need to do that again from its callers. Drop it.

Cc: linux-cifs@vger.kernel.org
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Paulo Alcantara <palcantara@suse.de>
fs/cifs/dfs_cache.c

index e3e1c13df4391ea5b45782b0cfb691d34da3d2ee..1692c0c6c23ae503f45a3239c2e7ba4ae2a54a1b 100644 (file)
@@ -492,7 +492,7 @@ static struct dfs_cache_entry *__find_cache_entry(unsigned int hash,
 #ifdef CONFIG_CIFS_DEBUG2
                        char *name = get_tgt_name(ce);
 
-                       if (unlikely(IS_ERR(name))) {
+                       if (IS_ERR(name)) {
                                rcu_read_unlock();
                                return ERR_CAST(name);
                        }