Skip to contentSkip to conversation

fs: cifs: drop unneeded likely() call around IS_ERR()

PATCH In review Enrico Weigelt, metux IT consult 3 participants 3 messages Jun 5, 2019 – Jun 6, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs: cifs: drop unneeded likely() call around IS_ERR()

From: Enrico Weigelt <[email protected]>

IS_ERR() already calls unlikely(), so this extra unlikely() call around IS_ERR() is not needed.

---
 fs/cifs/dfs_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/dfs_cache.c +1 -1
index e3e1c13..1692c0c 100644
@@ -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);
 			}
Signature · 1 line
1.9.1
#1 lore raw

This duplicates a patch submitted earlier by Kefeng Wang <[email protected]> which I plan to merge later today into cifs-2.6.git for-next

Quoted 27 lines · metux IT consult

From: Enrico Weigelt <[email protected]>

IS_ERR() already calls unlikely(), so this extra unlikely() call around IS_ERR() is not needed.

---
 fs/cifs/dfs_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/dfs_cache.c +1 -2
index e3e1c13..1692c0c 100644
@@ -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);
                        }
--

1.9.1

Signature · 3 lines
Thanks,

Steve
#2 lore raw
Quoted 3 lines · Steve French

This duplicates a patch submitted earlier by Kefeng Wang <[email protected]> which I plan to merge later today into cifs-2.6.git for-next

Great :)
Just ignore my patch.

--mtx

Signature · 3 lines
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
[email protected] -- +49-151-27565287