summaryrefslogtreecommitdiff
path: root/fs/bcachefs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/bcachefs')
-rw-r--r--fs/bcachefs/btree_update.h24
-rw-r--r--fs/bcachefs/btree_update_leaf.c41
-rw-r--r--fs/bcachefs/dirent.c12
-rw-r--r--fs/bcachefs/dirent.h2
-rw-r--r--fs/bcachefs/ec.c10
-rw-r--r--fs/bcachefs/fs-io.c6
-rw-r--r--fs/bcachefs/fsck.c127
-rw-r--r--fs/bcachefs/inode.c2
-rw-r--r--fs/bcachefs/recovery.c2
-rw-r--r--fs/bcachefs/xattr.c3
10 files changed, 124 insertions, 105 deletions
diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h
index ad8cbf3fb778..d72da179f866 100644
--- a/fs/bcachefs/btree_update.h
+++ b/fs/bcachefs/btree_update.h
@@ -131,24 +131,34 @@ static inline void bch2_trans_update(struct btree_trans *trans,
};
}
-#define bch2_trans_do(_c, _journal_seq, _flags, _do) \
+#define __bch2_trans_do(_trans, _disk_res, _journal_seq, \
+ _flags, _reset_flags, _do) \
({ \
- struct btree_trans trans; \
int _ret; \
\
- bch2_trans_init(&trans, (_c), 0, 0); \
- \
do { \
- bch2_trans_begin(&trans); \
+ bch2_trans_reset(_trans, _reset_flags); \
\
- _ret = (_do) ?: bch2_trans_commit(&trans, NULL, \
+ _ret = (_do) ?: bch2_trans_commit(_trans, (_disk_res), \
(_journal_seq), (_flags)); \
} while (_ret == -EINTR); \
\
- bch2_trans_exit(&trans); \
_ret; \
})
+#define bch2_trans_do(_c, _disk_res, _journal_seq, _flags, _do) \
+({ \
+ struct btree_trans trans; \
+ int _ret, _ret2; \
+ \
+ bch2_trans_init(&trans, (_c), 0, 0); \
+ _ret = __bch2_trans_do(&trans, _disk_res, _journal_seq, _flags, \
+ TRANS_RESET_MEM|TRANS_RESET_ITERS, _do); \
+ _ret2 = bch2_trans_exit(&trans); \
+ \
+ _ret ?: _ret2; \
+})
+
#define trans_for_each_update(_trans, _i) \
for ((_i) = (_trans)->updates; \
(_i) < (_trans)->updates + (_trans)->nr_updates; \
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 55f785dadaac..1112bdb689dc 100644
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -823,6 +823,20 @@ err:
goto retry;
}
+static int __bch2_btree_insert(struct btree_trans *trans,
+ enum btree_id id, struct bkey_i *k)
+{
+ struct btree_iter *iter;
+
+ iter = bch2_trans_get_iter(trans, id, bkey_start_pos(&k->k),
+ BTREE_ITER_INTENT);
+ if (IS_ERR(iter))
+ return PTR_ERR(iter);
+
+ bch2_trans_update(trans, iter, k);
+ return 0;
+}
+
/**
* bch2_btree_insert - insert keys into the extent btree
* @c: pointer to struct bch_fs
@@ -831,29 +845,12 @@ err:
* @hook: insert callback
*/
int bch2_btree_insert(struct bch_fs *c, enum btree_id id,
- struct bkey_i *k,
- struct disk_reservation *disk_res,
- u64 *journal_seq, int flags)
+ struct bkey_i *k,
+ struct disk_reservation *disk_res,
+ u64 *journal_seq, int flags)
{
- struct btree_trans trans;
- struct btree_iter *iter;
- int ret;
-
- bch2_trans_init(&trans, c, 0, 0);
-retry:
- bch2_trans_begin(&trans);
-
- iter = bch2_trans_get_iter(&trans, id, bkey_start_pos(&k->k),
- BTREE_ITER_INTENT);
-
- bch2_trans_update(&trans, iter, k);
-
- ret = bch2_trans_commit(&trans, disk_res, journal_seq, flags);
- if (ret == -EINTR)
- goto retry;
- bch2_trans_exit(&trans);
-
- return ret;
+ return bch2_trans_do(c, disk_res, journal_seq, flags,
+ __bch2_btree_insert(&trans, id, k));
}
int bch2_btree_delete_at_range(struct btree_trans *trans,
diff --git a/fs/bcachefs/dirent.c b/fs/bcachefs/dirent.c
index 38017699c04a..1bf53c55912d 100644
--- a/fs/bcachefs/dirent.c
+++ b/fs/bcachefs/dirent.c
@@ -281,18 +281,6 @@ int bch2_dirent_delete_at(struct btree_trans *trans,
hash_info, iter);
}
-int bch2_dirent_delete(struct bch_fs *c, u64 dir_inum,
- const struct bch_hash_info *hash_info,
- const struct qstr *name,
- u64 *journal_seq)
-{
- return bch2_trans_do(c, journal_seq,
- BTREE_INSERT_ATOMIC|
- BTREE_INSERT_NOFAIL,
- bch2_hash_delete(&trans, bch2_dirent_hash_desc, hash_info,
- dir_inum, name));
-}
-
struct btree_iter *
__bch2_dirent_lookup_trans(struct btree_trans *trans, u64 dir_inum,
const struct bch_hash_info *hash_info,
diff --git a/fs/bcachefs/dirent.h b/fs/bcachefs/dirent.h
index e6184dc796d3..34769371dd13 100644
--- a/fs/bcachefs/dirent.h
+++ b/fs/bcachefs/dirent.h
@@ -36,8 +36,6 @@ int bch2_dirent_create(struct btree_trans *, u64,
int bch2_dirent_delete_at(struct btree_trans *,
const struct bch_hash_info *,
struct btree_iter *);
-int bch2_dirent_delete(struct bch_fs *, u64, const struct bch_hash_info *,
- const struct qstr *, u64 *);
enum bch_rename_mode {
BCH_RENAME,
diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c
index 3b3b931dc6c9..ae07af49af02 100644
--- a/fs/bcachefs/ec.c
+++ b/fs/bcachefs/ec.c
@@ -1235,6 +1235,7 @@ static int __bch2_stripe_write_key(struct btree_trans *trans,
bch2_trans_update(trans, iter, &new_key->k_i);
return bch2_trans_commit(trans, NULL, NULL,
+ BTREE_INSERT_ATOMIC|
BTREE_INSERT_NOFAIL|flags);
}
@@ -1259,8 +1260,13 @@ int bch2_stripes_write(struct bch_fs *c, unsigned flags, bool *wrote)
if (!m->dirty)
continue;
- ret = __bch2_stripe_write_key(&trans, iter, m, giter.pos,
- new_key, flags);
+ do {
+ bch2_trans_reset(&trans, TRANS_RESET_MEM);
+
+ ret = __bch2_stripe_write_key(&trans, iter, m,
+ giter.pos, new_key, flags);
+ } while (ret == -EINTR);
+
if (ret)
break;
diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index 5656e26540fa..f766bbc35cee 100644
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -2465,9 +2465,7 @@ static long bchfs_fcollapse_finsert(struct bch_inode_info *inode,
struct bpos next_pos;
struct bpos move_pos = POS(inode->v.i_ino, offset >> 9);
struct bpos atomic_end;
- unsigned commit_flags = BTREE_INSERT_NOFAIL|
- BTREE_INSERT_ATOMIC|
- BTREE_INSERT_USE_RESERVE;
+ unsigned commit_flags = 0;
k = insert
? bch2_btree_iter_peek_prev(src)
@@ -2560,6 +2558,8 @@ reassemble:
ret = bch2_trans_commit(&trans, &disk_res,
&inode->ei_journal_seq,
+ BTREE_INSERT_ATOMIC|
+ BTREE_INSERT_NOFAIL|
commit_flags);
bch2_disk_reservation_put(c, &disk_res);
bkey_err:
diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index 3ae545b31c7a..a0fdd2ba92f6 100644
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -37,8 +37,8 @@ static s64 bch2_count_inode_sectors(struct btree_trans *trans, u64 inum)
return ret ?: sectors;
}
-static int remove_dirent(struct btree_trans *trans,
- struct bkey_s_c_dirent dirent)
+static int __remove_dirent(struct btree_trans *trans,
+ struct bkey_s_c_dirent dirent)
{
struct bch_fs *c = trans->c;
struct qstr name;
@@ -49,31 +49,41 @@ static int remove_dirent(struct btree_trans *trans,
char *buf;
name.len = bch2_dirent_name_bytes(dirent);
- buf = kmalloc(name.len + 1, GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
+ buf = bch2_trans_kmalloc(trans, name.len + 1);
+ if (IS_ERR(buf))
+ return PTR_ERR(buf);
memcpy(buf, dirent.v->d_name, name.len);
buf[name.len] = '\0';
name.name = buf;
- /* Unlock so we don't deadlock, after copying name: */
- bch2_trans_unlock(trans);
-
- ret = bch2_inode_find_by_inum(c, dir_inum, &dir_inode);
- if (ret) {
+ ret = bch2_inode_find_by_inum_trans(trans, dir_inum, &dir_inode);
+ if (ret && ret != -EINTR)
bch_err(c, "remove_dirent: err %i looking up directory inode", ret);
- goto err;
- }
+ if (ret)
+ return ret;
dir_hash_info = bch2_hash_info_init(c, &dir_inode);
- ret = bch2_dirent_delete(c, dir_inum, &dir_hash_info, &name, NULL);
- if (ret)
+ ret = bch2_hash_delete(trans, bch2_dirent_hash_desc,
+ &dir_hash_info, dir_inum, &name);
+ if (ret && ret != -EINTR)
bch_err(c, "remove_dirent: err %i deleting dirent", ret);
-err:
- kfree(buf);
- return ret;
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int remove_dirent(struct btree_trans *trans,
+ struct bkey_s_c_dirent dirent)
+{
+ return __bch2_trans_do(trans, NULL, NULL,
+ BTREE_INSERT_ATOMIC|
+ BTREE_INSERT_NOFAIL|
+ BTREE_INSERT_LAZY_RW,
+ TRANS_RESET_MEM,
+ __remove_dirent(trans, dirent));
}
static int reattach_inode(struct bch_fs *c,
@@ -88,7 +98,7 @@ static int reattach_inode(struct bch_fs *c,
snprintf(name_buf, sizeof(name_buf), "%llu", inum);
name = (struct qstr) QSTR(name_buf);
- ret = bch2_trans_do(c, NULL,
+ ret = bch2_trans_do(c, NULL, NULL,
BTREE_INSERT_ATOMIC|
BTREE_INSERT_LAZY_RW,
bch2_link_trans(&trans, lostfound_inode->bi_inum,
@@ -171,27 +181,27 @@ static int hash_redo_key(const struct bch_hash_desc desc,
struct btree_iter *k_iter, struct bkey_s_c k,
u64 hashed)
{
+ struct bkey_i delete;
struct bkey_i *tmp;
- int ret = 0;
- tmp = kmalloc(bkey_bytes(k.k), GFP_KERNEL);
- if (!tmp)
- return -ENOMEM;
+ bch2_trans_reset(trans, TRANS_RESET_MEM);
+
+ tmp = bch2_trans_kmalloc(trans, bkey_bytes(k.k));
+ if (IS_ERR(tmp))
+ return PTR_ERR(tmp);
bkey_reassemble(tmp, k);
- ret = bch2_btree_delete_at(trans, k_iter, 0);
- if (ret)
- goto err;
+ bkey_init(&delete.k);
+ delete.k.p = k_iter->pos;
+ bch2_trans_update(trans, k_iter, &delete);
- bch2_hash_set(trans, desc, &h->info, k_iter->pos.inode,
- tmp, BCH_HASH_SET_MUST_CREATE);
- ret = bch2_trans_commit(trans, NULL, NULL,
- BTREE_INSERT_NOFAIL|
- BTREE_INSERT_LAZY_RW);
-err:
- kfree(tmp);
- return ret;
+ return bch2_hash_set(trans, desc, &h->info, k_iter->pos.inode,
+ tmp, BCH_HASH_SET_MUST_CREATE) ?:
+ bch2_trans_commit(trans, NULL, NULL,
+ BTREE_INSERT_ATOMIC|
+ BTREE_INSERT_NOFAIL|
+ BTREE_INSERT_LAZY_RW);
}
static int fsck_hash_delete_at(struct btree_trans *trans,
@@ -313,9 +323,11 @@ static int hash_check_key(struct btree_trans *trans,
"hashed to %llu chain starts at %llu\n%s",
desc.btree_id, k.k->p.offset,
hashed, h->chain->pos.offset,
- (bch2_bkey_val_to_text(&PBUF(buf), c,
- k), buf))) {
- ret = hash_redo_key(desc, trans, h, k_iter, k, hashed);
+ (bch2_bkey_val_to_text(&PBUF(buf), c, k), buf))) {
+ do {
+ ret = hash_redo_key(desc, trans, h, k_iter, k, hashed);
+ } while (ret == -EINTR);
+
if (ret) {
bch_err(c, "hash_redo_key err %i", ret);
return ret;
@@ -376,11 +388,12 @@ static int check_dirent_hash(struct btree_trans *trans, struct hash_check *h,
if (fsck_err(c, "dirent with junk at end, was %s (%zu) now %s (%u)",
buf, strlen(buf), d->v.d_name, len)) {
- bch2_trans_update(trans, iter, &d->k_i);
-
- ret = bch2_trans_commit(trans, NULL, NULL,
- BTREE_INSERT_NOFAIL|
- BTREE_INSERT_LAZY_RW);
+ ret = __bch2_trans_do(trans, NULL, NULL,
+ BTREE_INSERT_ATOMIC|
+ BTREE_INSERT_NOFAIL|
+ BTREE_INSERT_LAZY_RW,
+ TRANS_RESET_MEM,
+ (bch2_trans_update(trans, iter, &d->k_i), 0));
if (ret)
goto err;
@@ -402,8 +415,11 @@ err_redo:
k->k->p.offset, hash, h->chain->pos.offset,
(bch2_bkey_val_to_text(&PBUF(buf), c,
*k), buf))) {
- ret = hash_redo_key(bch2_dirent_hash_desc, trans,
- h, iter, *k, hash);
+ do {
+ ret = hash_redo_key(bch2_dirent_hash_desc, trans,
+ h, iter, *k, hash);
+ } while (ret == -EINTR);
+
if (ret)
bch_err(c, "hash_redo_key err %i", ret);
else
@@ -646,11 +662,12 @@ retry:
bkey_reassemble(&n->k_i, d.s_c);
n->v.d_type = mode_to_type(target.bi_mode);
- bch2_trans_update(&trans, iter, &n->k_i);
-
- ret = bch2_trans_commit(&trans, NULL, NULL,
- BTREE_INSERT_NOFAIL|
- BTREE_INSERT_LAZY_RW);
+ ret = __bch2_trans_do(&trans, NULL, NULL,
+ BTREE_INSERT_ATOMIC|
+ BTREE_INSERT_NOFAIL|
+ BTREE_INSERT_LAZY_RW,
+ TRANS_RESET_MEM,
+ (bch2_trans_update(&trans, iter, &n->k_i), 0));
kfree(n);
if (ret)
goto err;
@@ -790,7 +807,7 @@ fsck_err:
create_lostfound:
bch2_inode_init_early(c, lostfound_inode);
- ret = bch2_trans_do(c, NULL,
+ ret = bch2_trans_do(c, NULL, NULL,
BTREE_INSERT_ATOMIC|
BTREE_INSERT_NOFAIL|
BTREE_INSERT_LAZY_RW,
@@ -1261,12 +1278,14 @@ static int check_inode(struct btree_trans *trans,
struct bkey_inode_buf p;
bch2_inode_pack(&p, &u);
- bch2_trans_update(trans, iter, &p.inode.k_i);
- ret = bch2_trans_commit(trans, NULL, NULL,
- BTREE_INSERT_NOFAIL|
- BTREE_INSERT_LAZY_RW);
- if (ret && ret != -EINTR)
+ ret = __bch2_trans_do(trans, NULL, NULL,
+ BTREE_INSERT_ATOMIC|
+ BTREE_INSERT_NOFAIL|
+ BTREE_INSERT_LAZY_RW,
+ TRANS_RESET_MEM,
+ (bch2_trans_update(trans, iter, &p.inode.k_i), 0));
+ if (ret)
bch_err(c, "error in fsck: error %i "
"updating inode", ret);
}
diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c
index 67555db01dc4..e2407dcbcb35 100644
--- a/fs/bcachefs/inode.c
+++ b/fs/bcachefs/inode.c
@@ -533,7 +533,7 @@ int bch2_inode_find_by_inum_trans(struct btree_trans *trans, u64 inode_nr,
int bch2_inode_find_by_inum(struct bch_fs *c, u64 inode_nr,
struct bch_inode_unpacked *inode)
{
- return bch2_trans_do(c, NULL, 0,
+ return bch2_trans_do(c, NULL, NULL, 0,
bch2_inode_find_by_inum_trans(&trans, inode_nr, inode));
}
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index e6b51131cff2..a3ee2f474952 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -1009,7 +1009,7 @@ int bch2_fs_initialize(struct bch_fs *c)
bch2_inode_init_early(c, &lostfound_inode);
err = "error creating lost+found";
- ret = bch2_trans_do(c, NULL, BTREE_INSERT_ATOMIC,
+ ret = bch2_trans_do(c, NULL, NULL, BTREE_INSERT_ATOMIC,
bch2_create_trans(&trans, BCACHEFS_ROOT_INO,
&root_inode, &lostfound_inode,
&lostfound,
diff --git a/fs/bcachefs/xattr.c b/fs/bcachefs/xattr.c
index 5aeff1012f8b..6cef6c14fc89 100644
--- a/fs/bcachefs/xattr.c
+++ b/fs/bcachefs/xattr.c
@@ -328,7 +328,8 @@ static int bch2_xattr_set_handler(const struct xattr_handler *handler,
struct bch_inode_info *inode = to_bch_ei(vinode);
struct bch_fs *c = inode->v.i_sb->s_fs_info;
- return bch2_trans_do(c, &inode->ei_journal_seq, BTREE_INSERT_ATOMIC,
+ return bch2_trans_do(c, NULL, &inode->ei_journal_seq,
+ BTREE_INSERT_ATOMIC,
bch2_xattr_set(&trans, inode->v.i_ino,
&inode->ei_str_hash,
name, value, size,
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 13:36:53 +0000