Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: Fix unhandled transaction restart in fallocate

Browse Source 
This used to not matter, but now we're being more strict.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-10-25 20:18:48 -04:00
parent 8e910ca20e
commit c1fa854acc
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -587,7 +587,7 @@ static noinline int __bchfs_fallocate(struct bch_inode_info *inode, int mode,
POS(inode->v.i_ino, start_sector), POS(inode->v.i_ino, start_sector),
BTREE_ITER_slots|BTREE_ITER_intent); BTREE_ITER_slots|BTREE_ITER_intent);
while (!ret && bkey_lt(iter.pos, end_pos)) { while (!ret) {
s64 i_sectors_delta = 0; s64 i_sectors_delta = 0;
struct quota_res quota_res = { 0 }; struct quota_res quota_res = { 0 };
struct bkey_s_c k; struct bkey_s_c k;
@ -598,6 +598,9 @@ static noinline int __bchfs_fallocate(struct bch_inode_info *inode, int mode,
bch2_trans_begin(trans); bch2_trans_begin(trans);
if (bkey_ge(iter.pos, end_pos))
break;
ret = bch2_subvolume_get_snapshot(trans, ret = bch2_subvolume_get_snapshot(trans,
inode->ei_inum.subvol, &snapshot); inode->ei_inum.subvol, &snapshot);
if (ret) if (ret)
@ -634,12 +637,15 @@ static noinline int __bchfs_fallocate(struct bch_inode_info *inode, int mode,
if (bch2_clamp_data_hole(&inode->v, if (bch2_clamp_data_hole(&inode->v,
&hole_start, &hole_start,
&hole_end, &hole_end,
opts.data_replicas, true)) opts.data_replicas, true)) {
ret = drop_locks_do(trans, ret = drop_locks_do(trans,
(bch2_clamp_data_hole(&inode->v, (bch2_clamp_data_hole(&inode->v,
&hole_start, &hole_start,
&hole_end, &hole_end,
opts.data_replicas, false), 0)); opts.data_replicas, false), 0));
if (ret)
goto bkey_err;
}
bch2_btree_iter_set_pos(&iter, POS(iter.pos.inode, hole_start)); bch2_btree_iter_set_pos(&iter, POS(iter.pos.inode, hole_start));
if (ret) if (ret)
@ -667,10 +673,13 @@ static noinline int __bchfs_fallocate(struct bch_inode_info *inode, int mode,
bch2_i_sectors_acct(c, inode, &quota_res, i_sectors_delta); bch2_i_sectors_acct(c, inode, &quota_res, i_sectors_delta);
if (bch2_mark_pagecache_reserved(inode, &hole_start, if (bch2_mark_pagecache_reserved(inode, &hole_start,
iter.pos.offset, true)) iter.pos.offset, true)) {
drop_locks_do(trans, ret = drop_locks_do(trans,
bch2_mark_pagecache_reserved(inode, &hole_start, bch2_mark_pagecache_reserved(inode, &hole_start,
iter.pos.offset, false)); iter.pos.offset, false));
if (ret)
goto bkey_err;
}
bkey_err: bkey_err:
bch2_quota_reservation_put(c, inode, &quota_res); bch2_quota_reservation_put(c, inode, &quota_res);
if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) if (bch2_err_matches(ret, BCH_ERR_transaction_restart))