iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: convert fpunch to bch2_extent_update()

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2018-08-08 21:11:43 -04:00 committed by Kent Overstreet
parent 54e2264e17
commit 5f461e01b8
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fs/bcachefs/fs-io.c
View File

@ -2380,7 +2380,6 @@ err:
static long bch2_fpunch(struct bch_inode_info *inode, loff_t offset, loff_t len) static long bch2_fpunch(struct bch_inode_info *inode, loff_t offset, loff_t len)
{ {
struct bch_fs *c = inode->v.i_sb->s_fs_info; struct bch_fs *c = inode->v.i_sb->s_fs_info;
u64 ino = inode->v.i_ino;
u64 discard_start = round_up(offset, PAGE_SIZE) >> 9; u64 discard_start = round_up(offset, PAGE_SIZE) >> 9;
u64 discard_end = round_down(offset + len, PAGE_SIZE) >> 9; u64 discard_end = round_down(offset + len, PAGE_SIZE) >> 9;
int ret = 0; int ret = 0;
@ -2406,34 +2405,9 @@ static long bch2_fpunch(struct bch_inode_info *inode, loff_t offset, loff_t len)
truncate_pagecache_range(&inode->v, offset, offset + len - 1); truncate_pagecache_range(&inode->v, offset, offset + len - 1);
if (discard_start < discard_end) { if (discard_start < discard_end)
/* ret = __bch2_fpunch(c, inode, discard_start, discard_end,
* We need to pass in a disk reservation here because we might &inode->ei_journal_seq);
* be splitting a compressed extent into two. This isn't a
* problem with truncate because truncate will never split an
* extent, only truncate it...
*/
struct disk_reservation disk_res =
bch2_disk_reservation_init(c, 0);
struct i_sectors_hook i_sectors_hook =
i_sectors_hook_init(inode, 0);
int ret;
ret = i_sectors_dirty_start(c, &i_sectors_hook);
if (unlikely(ret))
goto err;
ret = bch2_btree_delete_range(c,
BTREE_ID_EXTENTS,
POS(ino, discard_start),
POS(ino, discard_end),
ZERO_VERSION,
&disk_res,
&i_sectors_hook.hook,
&inode->ei_journal_seq);
ret = i_sectors_dirty_finish(c, &i_sectors_hook) ?: ret;
}
err: err:
bch2_pagecache_block_put(&inode->ei_pagecache_lock); bch2_pagecache_block_put(&inode->ei_pagecache_lock);
inode_unlock(&inode->v); inode_unlock(&inode->v);