Skip to contentSkip to conversation

dm-writecache: add unlikely for returned value of rb_next/prev

PATCH In review Huaisheng Ye 2 participants 2 messages Apr 12, 2019 – Apr 23, 2019 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dm-writecache: add unlikely for returned value of rb_next/prev

From: Huaisheng Ye <[email protected]>

In functions writecache_discard and writecache_find_entry, there is high probablity that the pointer of structure rb_node doesn't equal to NULL. Add unlikly for the pointer node.

---
 drivers/md/dm-writecache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-writecache.c +2 -2
index 5b4d1c1..cfbbfbc 100644
@@ -571,7 +571,7 @@ static struct wc_entry *writecache_find_entry(struct dm_writecache *wc,
 			node = rb_prev(&e->rb_node);
 		else
 			node = rb_next(&e->rb_node);
-		if (!node)
+		if (unlikely(!node))
 			return e;
 		e2 = container_of(node, struct wc_entry, rb_node);
 		if (read_original_sector(wc, e2) != block)
@@ -804,7 +804,7 @@ static void writecache_discard(struct dm_writecache *wc, sector_t start, sector_
 			writecache_free_entry(wc, e);
 		}
 
-		if (!node)
+		if (unlikely(!node))
 			break;
 
 		e = container_of(node, struct wc_entry, rb_node);
Signature · 1 line
1.8.3.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Huaisheng Ye

From: Huaisheng Ye <[email protected]>

In functions writecache_discard and writecache_find_entry, there is high probablity that the pointer of structure rb_node doesn't equal to NULL. Add unlikly for the pointer node.

Quoted 29 lines
---
 drivers/md/dm-writecache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-writecache.c +2 -2
index 5b4d1c1..cfbbfbc 100644
@@ -571,7 +571,7 @@ static struct wc_entry *writecache_find_entry(struct dm_writecache *wc,
 			node = rb_prev(&e->rb_node);
 		else
 			node = rb_next(&e->rb_node);
-		if (!node)
+		if (unlikely(!node))
 			return e;
 		e2 = container_of(node, struct wc_entry, rb_node);
 		if (read_original_sector(wc, e2) != block)
@@ -804,7 +804,7 @@ static void writecache_discard(struct dm_writecache *wc, sector_t start, sector_
 			writecache_free_entry(wc, e);
 		}
 
-		if (!node)
+		if (unlikely(!node))
 			break;
 
 		e = container_of(node, struct wc_entry, rb_node);
Signature · 1 line
1.8.3.1