diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-03-16 07:46:26 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:12 +0300 |
| commit | b9e1adf57988fb4632b86c43fde1551a24299b86 (patch) | |
| tree | 3f6d8942ede2c864a84cb66501bf80d7682c60a7 /fs/bcachefs/fs-common.c | |
| parent | 14b393ee768e8339b9c64f82df24e8c081bdbff9 (diff) | |
| download | linux-b9e1adf57988fb4632b86c43fde1551a24299b86.tar.xz | |
bcachefs: Add support for dirents that point to subvolumes
Dirents currently always point to inodes. Subvolumes add a new type of
dirent, with d_type DT_SUBVOL, that instead points to an entry in the
subvolumes btree, and the subvolume has a pointer to the root inode.
This patch adds bch2_dirent_read_target() to get the inode (and
potentially subvolume) a dirent points to, and changes existing code to
use that instead of reading from d_inum directly.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/fs-common.c')
| -rw-r--r-- | fs/bcachefs/fs-common.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/bcachefs/fs-common.c b/fs/bcachefs/fs-common.c index 6bc82559c9b1..96b09b005d0b 100644 --- a/fs/bcachefs/fs-common.c +++ b/fs/bcachefs/fs-common.c @@ -159,17 +159,10 @@ int bch2_unlink_trans(struct btree_trans *trans, dir_hash = bch2_hash_info_init(c, dir_u); ret = __bch2_dirent_lookup_trans(trans, &dirent_iter, dir_inum, &dir_hash, - name, BTREE_ITER_INTENT); + name, &inum, BTREE_ITER_INTENT); if (ret) goto err; - k = bch2_btree_iter_peek_slot(&dirent_iter); - ret = bkey_err(k); - if (ret) - goto err; - - inum = le64_to_cpu(bkey_s_c_to_dirent(k).v->d_inum); - ret = bch2_inode_peek(trans, &inode_iter, inode_u, inum, BTREE_ITER_INTENT); if (ret) goto err; |