Commit a7ecd5f2 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: disk_accounting: bch2_dev_rcu -> bch2_dev_rcu_noerror 



Accounting keys that reference invalid devices are corrected by fsck,
they shouldn't cause an emergency shutdown.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 6534a404

fs/bcachefs/disk_accounting.c

+2 −2
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ int bch2_accounting_read(struct bch_fs *c) 
			break;

		case BCH_DISK_ACCOUNTING_dev_data_type:

			rcu_read_lock();

			struct bch_dev *ca = bch2_dev_rcu(c, k.dev_data_type.dev);

			struct bch_dev *ca = bch2_dev_rcu_noerror(c, k.dev_data_type.dev);

			if (ca) {

				struct bch_dev_usage_type __percpu *d = &ca->usage->d[k.dev_data_type.data_type];

				percpu_u64_set(&d->buckets,	v[0]);
@@ -911,7 +911,7 @@ void bch2_verify_accounting_clean(struct bch_fs *c) 
				break;

			case BCH_DISK_ACCOUNTING_dev_data_type: {

				rcu_read_lock();

				struct bch_dev *ca = bch2_dev_rcu(c, acc_k.dev_data_type.dev);

				struct bch_dev *ca = bch2_dev_rcu_noerror(c, acc_k.dev_data_type.dev);

				if (!ca) {

					rcu_read_unlock();

					continue;

fs/bcachefs/disk_accounting.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static inline int bch2_accounting_mem_mod_locked(struct btree_trans *trans, 
			break;

		case BCH_DISK_ACCOUNTING_dev_data_type:

			rcu_read_lock();

			struct bch_dev *ca = bch2_dev_rcu(c, acc_k.dev_data_type.dev);

			struct bch_dev *ca = bch2_dev_rcu_noerror(c, acc_k.dev_data_type.dev);

			if (ca) {

				this_cpu_add(ca->usage->d[acc_k.dev_data_type.data_type].buckets, a.v->d[0]);

				this_cpu_add(ca->usage->d[acc_k.dev_data_type.data_type].sectors, a.v->d[1]);