diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-05-01 19:15:29 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-05-09 16:23:36 -0400 |
| commit | 99179fb89847f312229bf816200e1e6e5038e3a3 (patch) | |
| tree | ac286bf40f0fa4e8e4c965e4b50b11886c6dbfd9 /fs | |
| parent | 2f4b4a3b44755d8c86eff64b9c54e3242a9b659c (diff) | |
| download | linux-next-history-99179fb89847f312229bf816200e1e6e5038e3a3.tar.gz | |
bcachefs: Invalid devices are now checked for by fsck, not .invalid methods
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/extents.c | 15 | ||||
| -rw-r--r-- | fs/bcachefs/journal_io.c | 11 |
2 files changed, 1 insertions, 25 deletions
diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c index b785712ae9b266..094caf1cdb35b2 100644 --- a/fs/bcachefs/extents.c +++ b/fs/bcachefs/extents.c @@ -1101,22 +1101,8 @@ static int extent_ptr_invalid(struct bch_fs *c, bool metadata, struct printbuf *err) { - struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k); int ret = 0; - if (!bch2_dev_exists(c, ptr->dev)) { - /* - * If we're in the write path this key might have already been - * overwritten, and we could be seeing a device that doesn't - * exist anymore due to racing with device removal: - */ - if (flags & BKEY_INVALID_WRITE) - return 0; - - bkey_fsck_err(c, err, ptr_to_invalid_device, - "pointer to invalid device (%u)", ptr->dev); - } - rcu_read_lock(); struct bch_dev *ca = bch2_dev_rcu(c, ptr->dev); if (!ca) { @@ -1130,6 +1116,7 @@ static int extent_ptr_invalid(struct bch_fs *c, unsigned bucket_size = ca->mi.bucket_size; rcu_read_unlock(); + struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k); bkey_for_each_ptr(ptrs, ptr2) bkey_fsck_err_on(ptr != ptr2 && ptr->dev == ptr2->dev, c, err, ptr_to_duplicate_device, diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c index d3bc5df0f3de5c..56f4d46ef09415 100644 --- a/fs/bcachefs/journal_io.c +++ b/fs/bcachefs/journal_io.c @@ -690,7 +690,6 @@ static int journal_entry_dev_usage_validate(struct bch_fs *c, container_of(entry, struct jset_entry_dev_usage, entry); unsigned bytes = jset_u64s(le16_to_cpu(entry->u64s)) * sizeof(u64); unsigned expected = sizeof(*u); - unsigned dev; int ret = 0; if (journal_entry_err_on(bytes < expected, @@ -702,16 +701,6 @@ static int journal_entry_dev_usage_validate(struct bch_fs *c, return ret; } - dev = le32_to_cpu(u->dev); - - if (journal_entry_err_on(!bch2_dev_exists(c, dev), - c, version, jset, entry, - journal_entry_dev_usage_bad_dev, - "bad dev")) { - journal_entry_null_range(entry, vstruct_next(entry)); - return ret; - } - if (journal_entry_err_on(u->pad, c, version, jset, entry, journal_entry_dev_usage_bad_pad, |