Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1227672 > unrolled thread
| Started by | Chao Yu <chao2.yu@samsung.com> |
|---|---|
| First post | 2015-09-18 11:00 +0200 |
| Last post | 2015-09-21 20:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/3] f2fs: introduce __try_update_largest_extent Chao Yu <chao2.yu@samsung.com> - 2015-09-18 11:00 +0200
Re: [PATCH 1/3] f2fs: introduce __try_update_largest_extent Jaegeuk Kim <jaegeuk@kernel.org> - 2015-09-21 20:50 +0200
| From | Chao Yu <chao2.yu@samsung.com> |
|---|---|
| Date | 2015-09-18 11:00 +0200 |
| Subject | [PATCH 1/3] f2fs: introduce __try_update_largest_extent |
| Message-ID | <q9ZGr-67w-27@gated-at.bofh.it> |
This patch adds a new helper __try_update_largest_extent for cleanup.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
---
fs/f2fs/extent_cache.c | 14 +++++---------
fs/f2fs/f2fs.h | 7 +++++++
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index c9d1cfd..31d5b48 100644
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -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
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index dbceb35..3342619 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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 */
--
2.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Jaegeuk Kim <jaegeuk@kernel.org> |
|---|---|
| Date | 2015-09-21 20:50 +0200 |
| Message-ID | <qbek2-6z0-25@gated-at.bofh.it> |
| In reply to | #1227672 |
Hi Chao,
On Fri, Sep 18, 2015 at 04:53:07PM +0800, Chao Yu wrote:
> This patch adds a new helper __try_update_largest_extent for cleanup.
>
> Signed-off-by: Chao Yu <chao2.yu@samsung.com>
> ---
> fs/f2fs/extent_cache.c | 14 +++++---------
> fs/f2fs/f2fs.h | 7 +++++++
> 2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
> index c9d1cfd..31d5b48 100644
> --- a/fs/f2fs/extent_cache.c
> +++ b/fs/f2fs/extent_cache.c
> @@ -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
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index dbceb35..3342619 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -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) ?
> +{
> + 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web