Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1488522 > unrolled thread

[PATCH 1/4] f2fs: assign return value in f2fs_gc

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/4] f2fs: assign return value in f2fs_gc Jaegeuk Kim <jaegeuk@kernel.org> - 2016-09-22 06:00 +0200
    [PATCH 2/4] f2fs: should put_page for summary page Jaegeuk Kim <jaegeuk@kernel.org> - 2016-09-22 06:00 +0200
    Re: [f2fs-dev] [PATCH 1/4] f2fs: assign return value in f2fs_gc Chao Yu <yuchao0@huawei.com> - 2016-09-22 13:00 +0200

#1488522 — [PATCH 1/4] f2fs: assign return value in f2fs_gc

This patch adds a return value of write_checkpoint for f2fs_gc.

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

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 24acbbb..400bc6d 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -925,10 +925,14 @@ gc_more:
 		 */
 		if (__get_victim(sbi, &segno, gc_type) ||
 						prefree_segments(sbi)) {
-			write_checkpoint(sbi, &cpc);
+			ret = write_checkpoint(sbi, &cpc);
+			if (ret)
+				goto stop;
 			segno = NULL_SEGNO;
 		} else if (has_not_enough_free_secs(sbi, 0, 0)) {
-			write_checkpoint(sbi, &cpc);
+			ret = write_checkpoint(sbi, &cpc);
+			if (ret)
+				goto stop;
 		}
 	}
 
@@ -948,7 +952,7 @@ gc_more:
 			goto gc_more;
 
 		if (gc_type == FG_GC)
-			write_checkpoint(sbi, &cpc);
+			ret = write_checkpoint(sbi, &cpc);
 	}
 stop:
 	mutex_unlock(&sbi->gc_mutex);
-- 
2.8.3

[toc] | [next] | [standalone]

#1488523 — [PATCH 2/4] f2fs: should put_page for summary page

We should call put_page for preloaded summary pages in do_garbage_collect.

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

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 400bc6d..a9a3c9f 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -848,7 +848,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
 	for (segno = start_segno; segno < end_segno; segno++) {
 
 		if (get_valid_blocks(sbi, segno, 1) == 0)
-			continue;
+			goto next;
 
 		/* find segment summary of victim */
 		sum_page = find_get_page(META_MAPPING(sbi),
@@ -874,7 +874,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
 								gc_type);
 
 		stat_inc_seg_count(sbi, type, gc_type);
-
+next:
 		f2fs_put_page(sum_page, 0);
 	}
 
-- 
2.8.3

[toc] | [prev] | [next] | [standalone]

#1488756 — Re: [f2fs-dev] [PATCH 1/4] f2fs: assign return value in f2fs_gc

On 2016/9/22 11:54, Jaegeuk Kim wrote:
> This patch adds a return value of write_checkpoint for f2fs_gc.
> 
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

Please add this in all patches of this serials.

Reviewed-by: Chao Yu <yuchao0@huawei.com>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web