diff options
| author | Taehee Yoo <ap420073@gmail.com> | 2015-04-21 15:59:12 +0900 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-05-07 11:38:32 -0700 |
| commit | 587c0a42552a69a58e7ccd363d30fd48d809fdcb (patch) | |
| tree | 79fb08d70b58e8d52bd1120ef05fa570121879b4 /fs/f2fs/file.c | |
| parent | f0c9cadae6706b6ce00ef724121fbf0f34187e22 (diff) | |
| download | linux-587c0a42552a69a58e7ccd363d30fd48d809fdcb.tar.bz2 | |
f2fs: add offset check routine before punch_hole() in f2fs_fallocate()
In the punch_hole(), if offset bigger than inode size, it returns SUCCESS.
Then f2fs_fallocate() will update time and dirty mark.
In that case, inode has not been modified actually.
So I have added offset check routine that prevent to call the punch_hole().
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/file.c')
| -rw-r--r-- | fs/f2fs/file.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 2b52e48d7482..3d6de54fead0 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -718,10 +718,6 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len) if (!S_ISREG(inode->i_mode)) return -EOPNOTSUPP; - /* skip punching hole beyond i_size */ - if (offset >= inode->i_size) - return ret; - if (f2fs_has_inline_data(inode)) { ret = f2fs_convert_inline_inode(inode); if (ret) @@ -830,15 +826,19 @@ static long f2fs_fallocate(struct file *file, int mode, loff_t offset, loff_t len) { struct inode *inode = file_inode(file); - long ret; + long ret = 0; if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) return -EOPNOTSUPP; mutex_lock(&inode->i_mutex); - if (mode & FALLOC_FL_PUNCH_HOLE) + if (mode & FALLOC_FL_PUNCH_HOLE) { + if (offset >= inode->i_size) + goto out; + ret = punch_hole(inode, offset, len); + } else ret = expand_inode_data(inode, offset, len, mode); @@ -847,6 +847,7 @@ static long f2fs_fallocate(struct file *file, int mode, mark_inode_dirty(inode); } +out: mutex_unlock(&inode->i_mutex); trace_f2fs_fallocate(inode, mode, offset, len, ret); |