* [PATCH 1/3] f2fs: introduce __try_update_largest_extent
@ 2015-09-18 8:53 Chao Yu
2015-09-21 18:40 ` Jaegeuk Kim
0 siblings, 1 reply; 3+ messages in thread
From: Chao Yu @ 2015-09-18 8:53 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel
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
------------------------------------------------------------------------------
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/3] f2fs: introduce __try_update_largest_extent
2015-09-18 8:53 [PATCH 1/3] f2fs: introduce __try_update_largest_extent Chao Yu
@ 2015-09-21 18:40 ` Jaegeuk Kim
2015-09-22 13:04 ` Chao Yu
0 siblings, 1 reply; 3+ messages in thread
From: Jaegeuk Kim @ 2015-09-21 18:40 UTC (permalink / raw)
To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH 1/3] f2fs: introduce __try_update_largest_extent
2015-09-21 18:40 ` Jaegeuk Kim
@ 2015-09-22 13:04 ` Chao Yu
0 siblings, 0 replies; 3+ messages in thread
From: Chao Yu @ 2015-09-22 13:04 UTC (permalink / raw)
To: 'Jaegeuk Kim'; +Cc: linux-f2fs-devel, linux-kernel
Hi Jaegeuk,
> -----Original Message-----
> From: Jaegeuk Kim [mailto:jaegeuk@kernel.org]
> Sent: Tuesday, September 22, 2015 2:40 AM
> To: Chao Yu
> Cc: linux-f2fs-devel@lists.sourceforge.net; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 1/3] f2fs: introduce __try_update_largest_extent
>
> 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) ?
More neat! I will change it.
Thanks,
>
> > +{
> > + 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-22 13:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18 8:53 [PATCH 1/3] f2fs: introduce __try_update_largest_extent Chao Yu
2015-09-21 18:40 ` Jaegeuk Kim
2015-09-22 13:04 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).