Skip to contentSkip to conversation

f2fs: introduce __try_update_largest_extent

PATCH Superseded Chao Yu 2 participants 3 messages Sep 18, 2015 – Sep 22, 2015 F2FS file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Chao Yu

author
#0 lore raw

PATCH 1/3 f2fs: introduce __try_update_largest_extent

This patch adds a new helper __try_update_largest_extent for cleanup.

---
 fs/f2fs/extent_cache.c | 14 +++++---------
 fs/f2fs/f2fs.h         |  7 +++++++
 2 files changed, 12 insertions(+), 9 deletions(-)
fs/f2fs/extent_cache.c +5 -9
index c9d1cfd..31d5b48 100644
@@ -351,8 +351,7 @@ static struct extent_node *__try_merge_extent_node(struct f2fs_sb_info *sbi,
 	}
 
 	if (en) {
-		if (en->ei.len > et->largest.len)
-			et->largest = en->ei;
+		__try_update_largest_extent(&et->largest, &en->ei);
 		et->cached_en = en;
 	}
 	return en;
@@ -389,8 +388,7 @@ do_insert:
 	if (!en)
 		return NULL;
 
-	if (en->ei.len > et->largest.len)
-		et->largest = en->ei;
+	__try_update_largest_extent(&et->largest, &en->ei);
 	et->cached_en = en;
 	return en;
 }
@@ -476,12 +474,10 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
 				: NULL;
 		}
 
-		if (parts) {
-			if (en->ei.len > et->largest.len)
-				et->largest = en->ei;
-		} else {
+		if (parts)
+			__try_update_largest_extent(&et->largest, &en->ei);
+		else
 			__detach_extent_node(sbi, et, en);
-		}
 
 		/*
 		 * if original extent is split into zero or two parts, extent
fs/f2fs/f2fs.h +7 -0
index dbceb35..3342619 100644
@@ -498,6 +498,13 @@ static inline bool __is_front_mergeable(struct extent_info *cur,
 	return __is_extent_mergeable(cur, front);
 }
 
+static inline void __try_update_largest_extent(struct extent_info *largest,
+						struct extent_info *cur)
+{
+	if (cur->len > largest->len)
+		*largest = *cur;
+}
+
 struct f2fs_nm_info {
 	block_t nat_blkaddr;		/* base disk address of NAT */
 	nid_t max_nid;			/* maximum possible node ids */
Signature · 1 line
2.5.2
maintainer
#1 lore raw

Hi Chao,

Quoted 53 lines · Chao Yu

This patch adds a new helper __try_update_largest_extent for cleanup.

---
 fs/f2fs/extent_cache.c | 14 +++++---------
 fs/f2fs/f2fs.h         |  7 +++++++
 2 files changed, 12 insertions(+), 9 deletions(-)
fs/f2fs/extent_cache.c +5 -9
index c9d1cfd..31d5b48 100644
@@ -351,8 +351,7 @@ static struct extent_node *__try_merge_extent_node(struct f2fs_sb_info *sbi,
 	}
 
 	if (en) {
-		if (en->ei.len > et->largest.len)
-			et->largest = en->ei;
+		__try_update_largest_extent(&et->largest, &en->ei);
 		et->cached_en = en;
 	}
 	return en;
@@ -389,8 +388,7 @@ do_insert:
 	if (!en)
 		return NULL;
 
-	if (en->ei.len > et->largest.len)
-		et->largest = en->ei;
+	__try_update_largest_extent(&et->largest, &en->ei);
 	et->cached_en = en;
 	return en;
 }
@@ -476,12 +474,10 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
 				: NULL;
 		}
 
-		if (parts) {
-			if (en->ei.len > et->largest.len)
-				et->largest = en->ei;
-		} else {
+		if (parts)
+			__try_update_largest_extent(&et->largest, &en->ei);
+		else
 			__detach_extent_node(sbi, et, en);
-		}
 
 		/*
 		 * if original extent is split into zero or two parts, extent
fs/f2fs/f2fs.h +0 -0
index dbceb35..3342619 100644

fs/f2fs/f2fs.h static inline bool __is_front_mergeable(struct extent_info *cur, · line 502

Quoted 5 lines
fs/f2fs/f2fs.h +2 -0
@@ -498,6 +498,13 @@ static inline bool __is_front_mergeable(struct extent_info *cur,
 	return __is_extent_mergeable(cur, front);
 }
 
+static inline void __try_update_largest_extent(struct extent_info *largest,
+						struct extent_info *cur)

How about __try_update_largest_extent(et, en) ?

Quoted 10 lines
fs/f2fs/f2fs.h +5 -0
+{
+	if (cur->len > largest->len)
+		*largest = *cur;
+}
+
 struct f2fs_nm_info {
 	block_t nat_blkaddr;		/* base disk address of NAT */
 	nid_t max_nid;			/* maximum possible node ids */
Signature · 1 line
2.5.2
author
#2 lore raw

Hi Jaegeuk,

Quoted 67 lines

-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Tuesday, September 22, 2015 2:40 AM
To: Chao Yu
Cc: [email protected]; [email protected]
Subject: Re: [PATCH 1/3] f2fs: introduce __try_update_largest_extent

Hi Chao,

fs/f2fs/extent_cache.c static struct extent_node *__try_merge_extent_node(struct f2fs_sb_info

Quoted 13 lines · Chao Yu

This patch adds a new helper __try_update_largest_extent for cleanup.

---
 fs/f2fs/extent_cache.c | 14 +++++---------
 fs/f2fs/f2fs.h         |  7 +++++++
 2 files changed, 12 insertions(+), 9 deletions(-)
fs/f2fs/extent_cache.c +0 -0
index c9d1cfd..31d5b48 100644
@@ -351,8 +351,7 @@ static struct extent_node *__try_merge_extent_node(struct f2fs_sb_info

*sbi,

Quoted 43 lines
fs/f2fs/extent_cache.c +5 -9
 	}
 
 	if (en) {
-		if (en->ei.len > et->largest.len)
-			et->largest = en->ei;
+		__try_update_largest_extent(&et->largest, &en->ei);
 		et->cached_en = en;
 	}
 	return en;
@@ -389,8 +388,7 @@ do_insert:
 	if (!en)
 		return NULL;
 
-	if (en->ei.len > et->largest.len)
-		et->largest = en->ei;
+	__try_update_largest_extent(&et->largest, &en->ei);
 	et->cached_en = en;
 	return en;
 }
@@ -476,12 +474,10 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
 				: NULL;
 		}
 
-		if (parts) {
-			if (en->ei.len > et->largest.len)
-				et->largest = en->ei;
-		} else {
+		if (parts)
+			__try_update_largest_extent(&et->largest, &en->ei);
+		else
 			__detach_extent_node(sbi, et, en);
-		}
 
 		/*
 		 * if original extent is split into zero or two parts, extent
fs/f2fs/f2fs.h +0 -0
index dbceb35..3342619 100644
@@ -498,6 +498,13 @@ static inline bool __is_front_mergeable(struct extent_info *cur,
 	return __is_extent_mergeable(cur, front);
 }
 
Quoted 4 lines

fs/f2fs/f2fs.h static inline bool __is_front_mergeable(struct extent_info *cur, · line 502

Quoted 2 lines
fs/f2fs/f2fs.h +2 -0
+static inline void __try_update_largest_extent(struct extent_info *largest,
+						struct extent_info *cur)

How about __try_update_largest_extent(et, en) ?

More neat! I will change it.

Thanks,

Quoted 11 lines
Quoted 11 lines
fs/f2fs/f2fs.h +5 -1
+{
+	if (cur->len > largest->len)
+		*largest = *cur;
+}
+
 struct f2fs_nm_info {
 	block_t nat_blkaddr;		/* base disk address of NAT */
 	nid_t max_nid;			/* maximum possible node ids */
--

2.5.2