[PATCH 1/2] f2fs: check only data or node for summary

[PATCH 1/2] f2fs: check only data or node for summary

[Jaegeuk Kim]

We can check data or node types only for gc, since we allocate different type of
data/node blocks in a different logs occasionally.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fs/f2fs/gc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index e1d274c..c2c4ac3 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -806,7 +806,8 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
 		f2fs_put_page(sum_page, 0);
 
 		sum = page_address(sum_page);
-		f2fs_bug_on(sbi, type != GET_SUM_TYPE((&sum->footer)));
+		f2fs_bug_on(sbi, IS_DATASEG(type) !=
+				IS_DATASEG(GET_SUM_TYPE((&sum->footer))));
 
 		/*
 		 * this is to avoid deadlock:
-- 
2.8.3

[PATCH 2/2] f2fs: report error for f2fs_parent_dir

[Jaegeuk Kim]

If there is no dentry, we can report its error correctly.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fs/f2fs/namei.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 78efe00..618829e 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -662,10 +662,11 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
 		goto out;
 
 	if (S_ISDIR(old_inode->i_mode)) {
-		err = -EIO;
 		old_dir_entry = f2fs_parent_dir(old_inode, &old_dir_page);
-		if (!old_dir_entry)
+		if (!old_dir_entry) {
+			err = PTR_ERR(old_dir_page);
 			goto out_old;
+		}
 	}
 
 	if (flags & RENAME_WHITEOUT) {
@@ -838,19 +839,21 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
 	/* prepare for updating ".." directory entry info later */
 	if (old_dir != new_dir) {
 		if (S_ISDIR(old_inode->i_mode)) {
-			err = -EIO;
 			old_dir_entry = f2fs_parent_dir(old_inode,
 							&old_dir_page);
-			if (!old_dir_entry)
+			if (!old_dir_entry) {
+				err = PTR_ERR(old_dir_page);
 				goto out_new;
+			}
 		}
 
 		if (S_ISDIR(new_inode->i_mode)) {
-			err = -EIO;
 			new_dir_entry = f2fs_parent_dir(new_inode,
 							&new_dir_page);
-			if (!new_dir_entry)
+			if (!new_dir_entry) {
+				err = PTR_ERR(new_dir_page);
 				goto out_old_dir;
+			}
 		}
 	}
 
-- 
2.8.3

Re: [f2fs-dev] [PATCH 1/2] f2fs: check only data or node for summary

[He YunLei]

On 2016/6/11 5:01, Jaegeuk Kim wrote:
> We can check data or node types only for gc, since we allocate different type of
> data/node blocks in a different logs occasionally.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
>   fs/f2fs/gc.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> index e1d274c..c2c4ac3 100644
> --- a/fs/f2fs/gc.c
> +++ b/fs/f2fs/gc.c
> @@ -806,7 +806,8 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
>   		f2fs_put_page(sum_page, 0);
>
>   		sum = page_address(sum_page);
> -		f2fs_bug_on(sbi, type != GET_SUM_TYPE((&sum->footer)));
> +		f2fs_bug_on(sbi, IS_DATASEG(type) !=
> +				IS_DATASEG(GET_SUM_TYPE((&sum->footer))));

Hi, Kim
	type has been transformed into SUM_TYPE_DATA or SUM_TYPE_NODE, so here
no need to do this.

Thanks
>
>   		/*
>   		 * this is to avoid deadlock:
>

Re: [f2fs-dev] [PATCH 1/2] f2fs: check only data or node for summary

[Jaegeuk Kim]

On Wed, Jul 06, 2016 at 12:09:12PM +0800, He YunLei wrote:
> On 2016/6/11 5:01, Jaegeuk Kim wrote:
> > We can check data or node types only for gc, since we allocate different type of
> > data/node blocks in a different logs occasionally.
> > 
> > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> > ---
> >   fs/f2fs/gc.c | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> > index e1d274c..c2c4ac3 100644
> > --- a/fs/f2fs/gc.c
> > +++ b/fs/f2fs/gc.c
> > @@ -806,7 +806,8 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
> >   		f2fs_put_page(sum_page, 0);
> > 
> >   		sum = page_address(sum_page);
> > -		f2fs_bug_on(sbi, type != GET_SUM_TYPE((&sum->footer)));
> > +		f2fs_bug_on(sbi, IS_DATASEG(type) !=
> > +				IS_DATASEG(GET_SUM_TYPE((&sum->footer))));
> 
> Hi, Kim
> 	type has been transformed into SUM_TYPE_DATA or SUM_TYPE_NODE, so here
> no need to do this.

Oops, right. :)

Thanks,