bcachefs: Initialize c->name earlier on single dev filesystems
PATCH 1/2 bcachefs: Initialize c->name earlier on single dev filesystems
On single device filesystems, c->name contains the block device name, not the UUID.
Initialize this earlier, so that single device mode can use it for initializing sysfs/debugfs.
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/super.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
fs/bcachefs/super.c +18 -15
@@ -79,6 +79,8 @@ MODULE_SOFTDEP("pre: chacha20");MODULE_SOFTDEP ("pre: poly1305" );MODULE_SOFTDEP ("pre: xxhash" ); +typedef DARRAY (struct bch_sb_handle )bch_sb_handles ; +const char *const bch2_fs_flag_strs[] = { #define x(n) #n,BCH_FS_FLAGS ()
@@ -750,7 +752,8 @@ static int bch2_fs_online(struct bch_fs *c)return ret; } -static struct bch_fs *bch2_fs_alloc (struct bch_sb *sb,struct bch_opts opts) +static struct bch_fs *bch2_fs_alloc (struct bch_sb *sb,struct bch_opts opts, +bch_sb_handles *sbs) {struct bch_fs *c;struct printbuf name =PRINTBUF ;
@@ -864,14 +867,6 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts) }#endif -pr_uuid (&name, c->sb.user_uuid.b); - ret = name.allocation_failure ? -BCH_ERR_ENOMEM_fs_name_alloc :0 ; -if (ret) - goto err; - -strscpy (c->name, name.buf,sizeof (c->name)); -printbuf_exit (&name); -/* Compat: */ if (le16_to_cpu (sb->version) <= bcachefs_metadata_version_inode_v2 && !BCH_SB_JOURNAL_FLUSH_DELAY (sb))
@@ -902,6 +897,18 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts) goto err; } +if (sbs->nr !=1 ) +pr_uuid (&name, c->sb.user_uuid.b); +else +prt_bdevname (&name, sbs->data[0 ].bdev); + + ret = name.allocation_failure ? -BCH_ERR_ENOMEM_fs_name_alloc :0 ; +if (ret) + goto err; + +strscpy (c->name, name.buf,sizeof (c->name)); +printbuf_exit (&name); + iter_size =sizeof (struct sort_iter ) + (btree_blocks (c) +1 ) *2 *sizeof (struct sort_iter_set );
@@ -1497,11 +1504,7 @@ static int bch2_dev_attach_bdev(struct bch_fs *c, struct bch_sb_handle *sb)struct printbuf name =PRINTBUF ;prt_bdevname (&name, ca->disk_sb.bdev); - -if (c->sb.nr_devices ==1 ) -strscpy (c->name, name.buf,sizeof (c->name));strscpy (ca->name, name.buf,sizeof (ca->name)); -printbuf_exit (&name);rebalance_wakeup (c);
@@ -2163,7 +2166,7 @@ static inline int sb_cmp(struct bch_sb *l, struct bch_sb *r)struct bch_fs *bch2_fs_open (char *const *devices,unsigned nr_devices,struct bch_opts opts) { -DARRAY (struct bch_sb_handle ) sbs = {0 }; +bch_sb_handles sbs = {};struct bch_fs *c =NULL ;struct bch_sb_handle *best =NULL ;struct printbuf errbuf =PRINTBUF ;
@@ -2216,7 +2219,7 @@ struct bch_fs *bch2_fs_open(char * const *devices, unsigned nr_devices, goto err_print; } - c =bch2_fs_alloc (best->sb, opts); + c =bch2_fs_alloc (best->sb, opts, &sbs); ret =PTR_ERR_OR_ZERO (c);if (ret) goto err;
Signature · 1 line
2.49.0
PATCH 2/2 bcachefs: Single device mode
This provides a new option for single device mode - which allows multiple filesystems with the same UUID to be mounted simultaneously.
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/bcachefs_format.h | 2 +- fs/bcachefs/debug.c | 6 +++++- fs/bcachefs/errcode.h | 2 ++ fs/bcachefs/opts.c | 6 ++++++ fs/bcachefs/opts.h | 11 ++++++++--- fs/bcachefs/super.c | 14 ++++++++++---- 6 files changed, 32 insertions(+), 9 deletions(-)
fs/bcachefs/bcachefs_format.h +1 -1
@@ -842,7 +842,7 @@ LE64_BITMASK(BCH_SB_SHARD_INUMS, struct bch_sb, flags[3], 28, 29); LE64_BITMASK(BCH_SB_INODES_USE_KEY_CACHE,struct bch_sb, flags[3], 29, 30); LE64_BITMASK(BCH_SB_JOURNAL_FLUSH_DELAY,struct bch_sb, flags[3], 30, 62); LE64_BITMASK(BCH_SB_JOURNAL_FLUSH_DISABLED,struct bch_sb, flags[3], 62, 63); -/* one free bit */ +LE64_BITMASK(BCH_SB_SINGLE_DEVICE, struct bch_sb, flags[3], 63, 64); LE64_BITMASK(BCH_SB_JOURNAL_RECLAIM_DELAY,struct bch_sb, flags[4], 0, 32); LE64_BITMASK(BCH_SB_JOURNAL_TRANSACTION_NAMES,struct bch_sb, flags[4], 32, 33); LE64_BITMASK(BCH_SB_NOCOW, struct bch_sb, flags[4], 33, 34);
fs/bcachefs/debug.c +5 -1
@@ -933,7 +933,11 @@ void bch2_fs_debug_init(struct bch_fs *c)if (IS_ERR_OR_NULL (bch_debug))return ; -snprintf (name,sizeof (name),"%pU" , c->sb.user_uuid.b); +if (!c->opts.single_device) +snprintf (name,sizeof (name),"%pU" , c->sb.user_uuid.b); +else +strscpy (name, c->name,sizeof (name)); + c->fs_debug_dir =debugfs_create_dir (name, bch_debug);if (IS_ERR_OR_NULL (c->fs_debug_dir))return ;
fs/bcachefs/errcode.h +2 -0
@@ -192,6 +192,8 @@ x(BCH_ERR_data_update_done, data_update_done_no_rw_devs) \ x(EINVAL, device_state_not_allowed) \ x(EINVAL, member_info_missing) \ + x(EINVAL, single_device_filesystem) \ + x(EINVAL, not_single_device_filesystem) \ x(EINVAL, mismatched_block_size) \ x(EINVAL, block_size_too_small) \x (EINVAL , bucket_size_too_small) \
fs/bcachefs/opts.c +6 -0
@@ -498,6 +498,12 @@ int bch2_opt_check_may_set(struct bch_fs *c, struct bch_dev *ca, int id, u64 v)if (v)bch2_check_set_feature (c, BCH_FEATURE_ec);break ; +case Opt_single_device: +mutex_lock (&c->sb_lock); +if (bch2_sb_nr_devices (c->disk_sb.sb) >1 ) + ret = -BCH_ERR_not_single_device_filesystem; +mutex_unlock (&c->sb_lock); +break ; }return ret;
fs/bcachefs/opts.h +8 -3
@@ -517,7 +517,7 @@ enum fsck_err_opts { BCH_MEMBER_DATA_ALLOWED, BIT(BCH_DATA_journal)|BIT(BCH_DATA_btree)|BIT(BCH_DATA_user),\ "types", "Allowed data types for this device: journal, btree, and/or user")\x (discard, u8, \ -OPT_MOUNT |OPT_DEVICE |OPT_RUNTIME , \ +OPT_MOUNT |OPT_FS |OPT_DEVICE |OPT_RUNTIME , \OPT_BOOL (), \BCH_MEMBER_DISCARD , true, \NULL ,"Enable discard/TRIM support" ) \
@@ -525,8 +525,13 @@ enum fsck_err_opts { OPT_FS|OPT_MOUNT|OPT_RUNTIME, \ OPT_BOOL(), \ BCH2_NO_SB_OPT, true, \ - NULL, "BTREE_ITER_prefetch casuse btree nodes to be\n"\ - " prefetched sequentially") + NULL, "BTREE_ITER_prefetch causes btree nodes to be\n"\ + " prefetched sequentially") \ + x(single_device, u8, \ + OPT_FS|OPT_MOUNT|OPT_RUNTIME, \ + OPT_BOOL(), \ + BCH_SB_SINGLE_DEVICE, false, \ + NULL, "Devices with the same UUID may be mounted simultaneously") struct bch_opts { #define x(_name, _bits, ...) unsigned _name##_defined:1;
fs/bcachefs/super.c +10 -4
@@ -708,7 +708,8 @@ static int bch2_fs_online(struct bch_fs *c)lockdep_assert_held (&bch_fs_list_lock); -if (__bch2_uuid_to_fs (c->sb.uuid)) { +if (!c->opts.single_device && +__bch2_uuid_to_fs (c->sb.uuid)) {bch_err (c,"filesystem UUID already open" );return -EINVAL ; }
@@ -721,7 +722,9 @@ static int bch2_fs_online(struct bch_fs *c)bch2_fs_debug_init (c); - ret =kobject_add (&c->kobj,NULL ,"%pU" , c->sb.user_uuid.b) ?: + ret = (!c->opts.single_device + ?kobject_add (&c->kobj,NULL ,"%pU" , c->sb.user_uuid.b) + :kobject_add (&c->kobj,NULL ,"%s" , c->name)) ?:kobject_add (&c->internal, &c->kobj,"internal" ) ?:kobject_add (&c->opts_dir, &c->kobj,"options" ) ?: #ifndef CONFIG_BCACHEFS_NO_LATENCY_ACCT
@@ -897,7 +900,7 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts, goto err; } -if (sbs->nr !=1 ) +if (sbs->nr !=1 && !c->opts.single_device)pr_uuid (&name, c->sb.user_uuid.b);else prt_bdevname (&name, sbs->data[0 ].bdev);
@@ -1114,6 +1117,9 @@ static int bch2_dev_may_add(struct bch_sb *sb, struct bch_fs *c) {struct bch_member m =bch2_sb_member_get (sb, sb->dev_idx); +if (c->opts.single_device) +return -BCH_ERR_single_device_filesystem; +if (le16_to_cpu (sb->block_size) !=block_sectors (c))return -BCH_ERR_mismatched_block_size;
@@ -1781,7 +1787,7 @@ int bch2_dev_remove(struct bch_fs *c, struct bch_dev *ca, int flags)int bch2_dev_add (struct bch_fs *c,const char *path) {struct bch_opts opts =bch2_opts_empty (); -struct bch_sb_handle sb; +struct bch_sb_handle sb = {};struct bch_dev *ca =NULL ;struct printbuf errbuf =PRINTBUF ;struct printbuf label =PRINTBUF ;
Signature · 1 line
2.49.0