Commit 74ef9241 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: fix leak of orphan inode objects 



When unmounting filesystem, we should release all the ino entries.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 221149c0

fs/f2fs/checkpoint.c

+3 −3
Original line number Diff line number Diff line
@@ -449,12 +449,12 @@ bool exist_written_data(struct f2fs_sb_info *sbi, nid_t ino, int mode) 
	return e ? true : false;

}



void release_ino_entry(struct f2fs_sb_info *sbi)

void release_ino_entry(struct f2fs_sb_info *sbi, bool all)

{

	struct ino_entry *e, *tmp;

	int i;



	for (i = APPEND_INO; i <= UPDATE_INO; i++) {

	for (i = all ? ORPHAN_INO: APPEND_INO; i <= UPDATE_INO; i++) {

		struct inode_management *im = &sbi->im[i];



		spin_lock(&im->ino_lock);
@@ -1106,7 +1106,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
		invalidate_mapping_pages(META_MAPPING(sbi), discard_blk,

								discard_blk);



	release_ino_entry(sbi);

	release_ino_entry(sbi, false);



	if (unlikely(f2fs_cp_error(sbi)))

		return -EIO;

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -1911,7 +1911,7 @@ void ra_meta_pages_cond(struct f2fs_sb_info *, pgoff_t); 
long sync_meta_pages(struct f2fs_sb_info *, enum page_type, long);

void add_ino_entry(struct f2fs_sb_info *, nid_t, int type);

void remove_ino_entry(struct f2fs_sb_info *, nid_t, int type);

void release_ino_entry(struct f2fs_sb_info *);

void release_ino_entry(struct f2fs_sb_info *, bool);

bool exist_written_data(struct f2fs_sb_info *, nid_t, int);

int acquire_orphan_inode(struct f2fs_sb_info *);

void release_orphan_inode(struct f2fs_sb_info *);

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static void f2fs_put_super(struct super_block *sb) 
	 * normally superblock is clean, so we need to release this.

	 * In addition, EIO will skip do checkpoint, we need this as well.

	 */

	release_ino_entry(sbi);

	release_ino_entry(sbi, true);

	release_discard_addrs(sbi);



	f2fs_leave_shrinker(sbi);