alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rust: BtreeTrans lifetime now marked w.r.t. Fs

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-02-28 02:28:44 -05:00
parent b6f30fd188
commit daebbc085d
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rust-src/bch_bindgen/src/btree.rs
View File

@ -10,22 +10,23 @@ use std::mem::MaybeUninit;
use std::ptr; use std::ptr;
use bitflags::bitflags; use bitflags::bitflags;
pub struct BtreeTrans { pub struct BtreeTrans<'f> {
raw: c::btree_trans, raw: c::btree_trans,
fs: PhantomData<&'f Fs>
} }
impl BtreeTrans { impl<'f> BtreeTrans<'f> {
pub fn new<'a>(fs: &'a Fs) -> BtreeTrans { pub fn new(fs: &'f Fs) -> BtreeTrans {
unsafe { unsafe {
let mut trans: MaybeUninit<BtreeTrans> = MaybeUninit::uninit(); let mut trans: MaybeUninit<c::btree_trans> = MaybeUninit::uninit();
c::__bch2_trans_init(&mut (*trans.as_mut_ptr()).raw, fs.raw, 0); c::__bch2_trans_init(&mut (*trans.as_mut_ptr()), fs.raw, 0);
trans.assume_init() BtreeTrans { raw: trans.assume_init(), fs: PhantomData }
} }
} }
} }
impl Drop for BtreeTrans { impl<'f> Drop for BtreeTrans<'f> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { c::bch2_trans_exit(&mut self.raw) } unsafe { c::bch2_trans_exit(&mut self.raw) }
} }
@ -52,13 +53,13 @@ bitflags! {
} }
} }
pub struct BtreeIter<'a> { pub struct BtreeIter<'t> {
raw: c::btree_iter, raw: c::btree_iter,
trans: PhantomData<&'a BtreeTrans>, trans: PhantomData<&'t BtreeTrans<'t>>,
} }
impl<'t> BtreeIter<'t> { impl<'t> BtreeIter<'t> {
pub fn new(trans: &'t BtreeTrans, btree: c::btree_id, pos: c::bpos, flags: BtreeIterFlags) -> BtreeIter { pub fn new(trans: &'t BtreeTrans<'t>, btree: c::btree_id, pos: c::bpos, flags: BtreeIterFlags) -> BtreeIter<'t> {
unsafe { unsafe {
let mut iter: MaybeUninit<c::btree_iter> = MaybeUninit::uninit(); let mut iter: MaybeUninit<c::btree_iter> = MaybeUninit::uninit();
@ -101,7 +102,7 @@ impl<'t> BtreeIter<'t> {
} }
} }
impl<'a> Drop for BtreeIter<'a> { impl<'t> Drop for BtreeIter<'t> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { c::bch2_trans_iter_exit(self.raw.trans, &mut self.raw) } unsafe { c::bch2_trans_iter_exit(self.raw.trans, &mut self.raw) }
} }