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

Commit a66c7b2f authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: remove unneeded code in punch_hole 



Because FALLOC_FL_PUNCH_HOLE flag must be ORed with FALLOC_FL_KEEP_SIZE
in fallocate, so we could remove the useless 'keep size' branch code which
will never be excuted in punch_hole.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarFan Li <fanofcode.li@samsung.com>
[Jaegeuk Kim: remove an unnecessary parameter togather]
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 031fa8cc

fs/f2fs/file.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -444,7 +444,7 @@ int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end) 
	return 0;

	return 0;

}

}





static int punch_hole(struct inode *inode, loff_t offset, loff_t len, int mode)

static int punch_hole(struct inode *inode, loff_t offset, loff_t len)

{

{

	pgoff_t pg_start, pg_end;

	pgoff_t pg_start, pg_end;

	loff_t off_start, off_end;

	loff_t off_start, off_end;
@@ -484,12 +484,6 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len, int mode) 
		}

		}

	}

	}





	if (!(mode & FALLOC_FL_KEEP_SIZE) &&

		i_size_read(inode) <= (offset + len)) {

		i_size_write(inode, offset);

		mark_inode_dirty(inode);

	}



	return ret;

	return ret;

}

}
@@ -552,7 +546,7 @@ static long f2fs_fallocate(struct file *file, int mode, 
		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	if (mode & FALLOC_FL_PUNCH_HOLE)

	if (mode & FALLOC_FL_PUNCH_HOLE)

		ret = punch_hole(inode, offset, len, mode);

		ret = punch_hole(inode, offset, len);

	else

	else

		ret = expand_inode_data(inode, offset, len, mode);

		ret = expand_inode_data(inode, offset, len, mode);