Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7056964a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'f2fs-for-4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs 

Pull f2fs fix from Jaegeuk Kim:
 "This contains one bug fix which causes a kernel panic during fstrim
  introduced in 4.14-rc1"

* tag 'f2fs-for-4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
  f2fs: fix potential panic during fstrim
parents da93b8c7 638164a2

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2525,7 +2525,7 @@ void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr); 
bool is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr);

void refresh_sit_entry(struct f2fs_sb_info *sbi, block_t old, block_t new);

void stop_discard_thread(struct f2fs_sb_info *sbi);

void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi);

void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi, bool umount);

void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc);

void release_discard_addrs(struct f2fs_sb_info *sbi);

int npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra);

fs/f2fs/segment.c

+3 −3
Original line number Diff line number Diff line
@@ -1210,11 +1210,11 @@ void stop_discard_thread(struct f2fs_sb_info *sbi) 
}



/* This comes from f2fs_put_super and f2fs_trim_fs */

void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi)

void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi, bool umount)

{

	__issue_discard_cmd(sbi, false);

	__drop_discard_cmd(sbi);

	__wait_discard_cmd(sbi, false);

	__wait_discard_cmd(sbi, !umount);

}



static void mark_discard_range_all(struct f2fs_sb_info *sbi)
@@ -2244,7 +2244,7 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range) 
	}

	/* It's time to issue all the filed discards */

	mark_discard_range_all(sbi);

	f2fs_wait_discard_bios(sbi);

	f2fs_wait_discard_bios(sbi, false);

out:

	range->len = F2FS_BLK_TO_BYTES(cpc.trimmed);

	return err;

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ static void f2fs_put_super(struct super_block *sb) 
	}



	/* be sure to wait for any on-going discard commands */

	f2fs_wait_discard_bios(sbi);

	f2fs_wait_discard_bios(sbi, true);



	if (f2fs_discard_en(sbi) && !sbi->discard_blks) {

		struct cp_control cpc = {