* [PATCH 1/4] f2fs: limit b_size of mapped bh in f2fs_map_bh
@ 2015-03-23 2:28 Chao Yu
2015-03-24 4:42 ` Jaegeuk Kim
0 siblings, 1 reply; 3+ messages in thread
From: Chao Yu @ 2015-03-23 2:28 UTC (permalink / raw)
To: Jaegeuk Kim, Changman Lee; +Cc: linux-f2fs-devel, linux-kernel
Map bh over max size which caller defined is not needed, limit it in
f2fs_map_bh.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
---
fs/f2fs/data.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f0a18a0..a99bc7f 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -255,15 +255,16 @@ static void f2fs_map_bh(struct super_block *sb, pgoff_t pgofs,
struct extent_info *ei, struct buffer_head *bh_result)
{
unsigned int blkbits = sb->s_blocksize_bits;
+ unsigned int maxblocks = bh_result->b_size >> blkbits;
size_t count;
clear_buffer_new(bh_result);
map_bh(bh_result, sb, ei->blk + pgofs - ei->fofs);
count = ei->fofs + ei->len - pgofs;
- if (count < (UINT_MAX >> blkbits))
- bh_result->b_size = (count << blkbits);
+ if (count > maxblocks)
+ bh_result->b_size = maxblocks << blkbits;
else
- bh_result->b_size = UINT_MAX;
+ bh_result->b_size = count << blkbits;
}
static bool lookup_extent_info(struct inode *inode, pgoff_t pgofs,
--
2.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/4] f2fs: limit b_size of mapped bh in f2fs_map_bh
2015-03-23 2:28 [PATCH 1/4] f2fs: limit b_size of mapped bh in f2fs_map_bh Chao Yu
@ 2015-03-24 4:42 ` Jaegeuk Kim
2015-03-24 5:02 ` Chao Yu
0 siblings, 1 reply; 3+ messages in thread
From: Jaegeuk Kim @ 2015-03-24 4:42 UTC (permalink / raw)
To: Chao Yu; +Cc: Changman Lee, linux-f2fs-devel, linux-kernel
Hi Chao,
On Mon, Mar 23, 2015 at 10:28:00AM +0800, Chao Yu wrote:
> Map bh over max size which caller defined is not needed, limit it in
> f2fs_map_bh.
>
> Signed-off-by: Chao Yu <chao2.yu@samsung.com>
> ---
> fs/f2fs/data.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index f0a18a0..a99bc7f 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -255,15 +255,16 @@ static void f2fs_map_bh(struct super_block *sb, pgoff_t pgofs,
> struct extent_info *ei, struct buffer_head *bh_result)
> {
> unsigned int blkbits = sb->s_blocksize_bits;
> + unsigned int maxblocks = bh_result->b_size >> blkbits;
> size_t count;
>
> clear_buffer_new(bh_result);
> map_bh(bh_result, sb, ei->blk + pgofs - ei->fofs);
> count = ei->fofs + ei->len - pgofs;
> - if (count < (UINT_MAX >> blkbits))
> - bh_result->b_size = (count << blkbits);
> + if (count > maxblocks)
> + bh_result->b_size = maxblocks << blkbits;
> else
> - bh_result->b_size = UINT_MAX;
> + bh_result->b_size = count << blkbits;
How about using min()?
Thanks,
> }
>
> static bool lookup_extent_info(struct inode *inode, pgoff_t pgofs,
> --
> 2.3.3
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH 1/4] f2fs: limit b_size of mapped bh in f2fs_map_bh
2015-03-24 4:42 ` Jaegeuk Kim
@ 2015-03-24 5:02 ` Chao Yu
0 siblings, 0 replies; 3+ messages in thread
From: Chao Yu @ 2015-03-24 5:02 UTC (permalink / raw)
To: 'Jaegeuk Kim'
Cc: 'Changman Lee', linux-f2fs-devel, linux-kernel
Hi Jaegeuk,
> -----Original Message-----
> From: Jaegeuk Kim [mailto:jaegeuk@kernel.org]
> Sent: Tuesday, March 24, 2015 12:42 PM
> To: Chao Yu
> Cc: Changman Lee; linux-f2fs-devel@lists.sourceforge.net; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 1/4] f2fs: limit b_size of mapped bh in f2fs_map_bh
>
> Hi Chao,
>
> On Mon, Mar 23, 2015 at 10:28:00AM +0800, Chao Yu wrote:
> > Map bh over max size which caller defined is not needed, limit it in
> > f2fs_map_bh.
> >
> > Signed-off-by: Chao Yu <chao2.yu@samsung.com>
> > ---
> > fs/f2fs/data.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> > index f0a18a0..a99bc7f 100644
> > --- a/fs/f2fs/data.c
> > +++ b/fs/f2fs/data.c
> > @@ -255,15 +255,16 @@ static void f2fs_map_bh(struct super_block *sb, pgoff_t pgofs,
> > struct extent_info *ei, struct buffer_head *bh_result)
> > {
> > unsigned int blkbits = sb->s_blocksize_bits;
> > + unsigned int maxblocks = bh_result->b_size >> blkbits;
> > size_t count;
> >
> > clear_buffer_new(bh_result);
> > map_bh(bh_result, sb, ei->blk + pgofs - ei->fofs);
> > count = ei->fofs + ei->len - pgofs;
> > - if (count < (UINT_MAX >> blkbits))
> > - bh_result->b_size = (count << blkbits);
> > + if (count > maxblocks)
> > + bh_result->b_size = maxblocks << blkbits;
> > else
> > - bh_result->b_size = UINT_MAX;
> > + bh_result->b_size = count << blkbits;
>
> How about using min()?
Better, I will do it. :)
Thanks,
>
> Thanks,
>
> > }
> >
> > static bool lookup_extent_info(struct inode *inode, pgoff_t pgofs,
> > --
> > 2.3.3
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-24 5:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-23 2:28 [PATCH 1/4] f2fs: limit b_size of mapped bh in f2fs_map_bh Chao Yu
2015-03-24 4:42 ` Jaegeuk Kim
2015-03-24 5:02 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox