Commit f2667e0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2024-02-17' of https://evilpiepirate.org/git/bcachefs 

Pull bcachefs fixes from Kent Overstreet:
 "Mostly pretty trivial, the user visible ones are:

   - don't barf when replicas_required > replicas

   - fix check_version_upgrade() so it doesn't do something nonsensical
     when we're downgrading"

* tag 'bcachefs-2024-02-17' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: Fix missing va_end()
  bcachefs: Fix check_version_upgrade()
  bcachefs: Clamp replicas_required to replicas
  bcachefs: fix missing endiannes conversion in sb_members
  bcachefs: fix kmemleak in __bch2_read_super error handling path
  bcachefs: Fix missing bch2_err_class() calls
parents ced59052 816054f4

fs/bcachefs/bcachefs.h

+12 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,18 @@ static inline struct stdio_redirect *bch2_fs_stdio_redirect(struct bch_fs *c) 
	return stdio;

}



static inline unsigned metadata_replicas_required(struct bch_fs *c)

{

	return min(c->opts.metadata_replicas,

		   c->opts.metadata_replicas_required);

}



static inline unsigned data_replicas_required(struct bch_fs *c)

{

	return min(c->opts.data_replicas,

		   c->opts.data_replicas_required);

}



#define BKEY_PADDED_ONSTACK(key, pad)				\

	struct { struct bkey_i key; __u64 key ## _pad[pad]; }

fs/bcachefs/btree_update_interior.c

+2 −1
Original line number Diff line number Diff line
@@ -280,7 +280,8 @@ static struct btree *__bch2_btree_node_alloc(struct btree_trans *trans, 
				      writepoint_ptr(&c->btree_write_point),

				      &devs_have,

				      res->nr_replicas,

				      c->opts.metadata_replicas_required,

				      min(res->nr_replicas,

					  c->opts.metadata_replicas_required),

				      watermark, 0, cl, &wp);

	if (unlikely(ret))

		return ERR_PTR(ret);

fs/bcachefs/fs.c

+5 −4
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static int bch2_link(struct dentry *old_dentry, struct inode *vdir, 
		bch2_subvol_is_ro(c, inode->ei_subvol) ?:

		__bch2_link(c, inode, dir, dentry);

	if (unlikely(ret))

		return ret;

		return bch2_err_class(ret);



	ihold(&inode->v);

	d_instantiate(dentry, &inode->v);
@@ -487,8 +487,9 @@ static int bch2_unlink(struct inode *vdir, struct dentry *dentry) 
	struct bch_inode_info *dir= to_bch_ei(vdir);

	struct bch_fs *c = dir->v.i_sb->s_fs_info;



	return bch2_subvol_is_ro(c, dir->ei_subvol) ?:

	int ret = bch2_subvol_is_ro(c, dir->ei_subvol) ?:

		__bch2_unlink(vdir, dentry, false);

	return bch2_err_class(ret);

}



static int bch2_symlink(struct mnt_idmap *idmap,
@@ -523,7 +524,7 @@ static int bch2_symlink(struct mnt_idmap *idmap, 
	return 0;

err:

	iput(&inode->v);

	return ret;

	return bch2_err_class(ret);

}



static int bch2_mkdir(struct mnt_idmap *idmap,
@@ -641,7 +642,7 @@ static int bch2_rename2(struct mnt_idmap *idmap, 
			   src_inode,

			   dst_inode);



	return ret;

	return bch2_err_class(ret);

}



static void bch2_setattr_copy(struct mnt_idmap *idmap,

fs/bcachefs/io_write.c

+1 −0
Original line number Diff line number Diff line
@@ -1564,6 +1564,7 @@ CLOSURE_CALLBACK(bch2_write) 
	BUG_ON(!op->write_point.v);

	BUG_ON(bkey_eq(op->pos, POS_MAX));



	op->nr_replicas_required = min_t(unsigned, op->nr_replicas_required, op->nr_replicas);

	op->start_time = local_clock();

	bch2_keylist_init(&op->insert_keys, op->inline_keys);

	wbio_init(bio)->put_bio = false;

fs/bcachefs/journal_io.c

+3 −1
Original line number Diff line number Diff line
@@ -1478,6 +1478,8 @@ static int journal_write_alloc(struct journal *j, struct journal_buf *w) 
		c->opts.foreground_target;

	unsigned i, replicas = 0, replicas_want =

		READ_ONCE(c->opts.metadata_replicas);

	unsigned replicas_need = min_t(unsigned, replicas_want,

				       READ_ONCE(c->opts.metadata_replicas_required));



	rcu_read_lock();

retry:
@@ -1526,7 +1528,7 @@ static int journal_write_alloc(struct journal *j, struct journal_buf *w) 


	BUG_ON(bkey_val_u64s(&w->key.k) > BCH_REPLICAS_MAX);



	return replicas >= c->opts.metadata_replicas_required ? 0 : -EROFS;

	return replicas >= replicas_need ? 0 : -EROFS;

}



static void journal_buf_realloc(struct journal *j, struct journal_buf *buf)