Update bcachefs sources to 39a84c99af2d bcachefs: Clamp replicas_required to replicas

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 1aa1789b35452cd6d17decc9ef3aecd2aca32ae9..e94031faf1be66a61ca45a53888965309effda33 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-bee7b5a4fa2135c9ec9d1c9424018ee494500bb5
+39a84c99af2dbbd797eb2f0d1bed04111f04f245

diff --git a/libbcachefs/bcachefs.h b/libbcachefs/bcachefs.h
index b53b321b687f680c7a5533c1c78eed8d0a0c5631..3b48c5e133b5b51de31e9f8cab7413d21fd11286 100644 (file)
--- a/libbcachefs/bcachefs.h
+++ b/libbcachefs/bcachefs.h
@@ -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]; }
 

diff --git a/libbcachefs/bcachefs_format.h b/libbcachefs/bcachefs_format.h
index 1bb24aa7352800a9660c513c028a865055e61ab0..20604e2708d6ad76ce42dedf2fc53de2b00f7125 100644 (file)
--- a/libbcachefs/bcachefs_format.h
+++ b/libbcachefs/bcachefs_format.h
@@ -1426,14 +1426,17 @@ LE32_BITMASK(JSET_NO_FLUSH,     struct jset, flags, 5, 6);
 /* Btree: */
 
 enum btree_id_flags {
-       BTREE_ID_EXTENTS        = BIT(0),
-       BTREE_ID_SNAPSHOTS      = BIT(1),
-       BTREE_ID_SNAPSHOT_FIELD = BIT(2),
-       BTREE_ID_DATA           = BIT(3),
+       /* key size field is nonzero, btree iterators handle as ranges  */
+       BTREE_ID_EXTENTS                = BIT(0),
+       BTREE_ID_SNAPSHOTS              = BIT(1),
+       BTREE_ID_SNAPSHOT_FIELD         = BIT(2),
+       BTREE_ID_SNAPSHOTS_UNREFFED     = BIT(3),
+       BTREE_ID_DATA                   = BIT(3),
 };
 
 #define BCH_BTREE_IDS()                                                                \
-       x(extents,              0,      BTREE_ID_EXTENTS|BTREE_ID_SNAPSHOTS|BTREE_ID_DATA,\
+       x(extents,              0,      BTREE_ID_EXTENTS|BTREE_ID_SNAPSHOTS|    \
+                                       BTREE_ID_SNAPSHOTS_UNREFFED|BTREE_ID_DATA,\
          BIT_ULL(KEY_TYPE_whiteout)|                                           \
          BIT_ULL(KEY_TYPE_error)|                                              \
          BIT_ULL(KEY_TYPE_cookie)|                                             \
@@ -1451,7 +1454,7 @@ enum btree_id_flags {
          BIT_ULL(KEY_TYPE_whiteout)|                                           \
          BIT_ULL(KEY_TYPE_hash_whiteout)|                                      \
          BIT_ULL(KEY_TYPE_dirent))                                             \
-       x(xattrs,               3,      BTREE_ID_SNAPSHOTS,                     \
+       x(xattrs,               3,      BTREE_ID_SNAPSHOTS|BTREE_ID_SNAPSHOTS_UNREFFED,\
          BIT_ULL(KEY_TYPE_whiteout)|                                           \
          BIT_ULL(KEY_TYPE_cookie)|                                             \
          BIT_ULL(KEY_TYPE_hash_whiteout)|                                      \

diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index b2ebf143c3b7d648f3fe0a90d5f046b7c854323f..0791531b7eb96940b375f5e52f78c58555198e65 100644 (file)
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -705,6 +705,17 @@ static inline bool btree_type_has_snapshots(enum btree_id id)
        return (1U << id) & mask;
 }
 
+static inline bool btree_type_snapshots_unreffed(enum btree_id id)
+{
+       const unsigned mask = 0
+#define x(name, nr, flags, ...)        |((!!((flags) & BTREE_ID_SNAPSHOTS_UNREFFED)) << nr)
+       BCH_BTREE_IDS()
+#undef x
+       ;
+
+       return (1U << id) & mask;
+}
+
 static inline bool btree_type_has_snapshot_field(enum btree_id id)
 {
        const unsigned mask = 0

diff --git a/libbcachefs/btree_update.c b/libbcachefs/btree_update.c
index d3d625d4977aaa7c8fdff4e1c0d8ac6ee72818db..ac852310cba24007f3b19dcb31a1c7f4118119a8 100644 (file)
--- a/libbcachefs/btree_update.c
+++ b/libbcachefs/btree_update.c
@@ -217,7 +217,8 @@ overwrite_interior_snapshot_key(struct btree_trans *trans,
                return ret;
 
        if (!bkey_deleted(old.k)) {
-               if (old.k->p.snapshot != k->k.p.snapshot) {
+               if (btree_type_snapshots_unreffed(iter->btree_id) &&
+                   old.k->p.snapshot != k->k.p.snapshot) {
                        /*
                         * We're overwriting a key in a different snapshot:
                         * check if it's also been overwritten in siblings

diff --git a/libbcachefs/btree_update_interior.c b/libbcachefs/btree_update_interior.c
index 5fbea33f6747432ef9c0624f82d766c114a573d3..70da4fa25c01e21bb7ca27ddf5048a1762fc8c4c 100644 (file)
--- a/libbcachefs/btree_update_interior.c
+++ b/libbcachefs/btree_update_interior.c
@@ -280,7 +280,8 @@ retry:
                                      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);

diff --git a/libbcachefs/fs-common.c b/libbcachefs/fs-common.c
index 3d43c036c5e0f85eb6b016250e6a774b6834c34f..255857ca583734ceff89aa3df38e6523080c4dde 100644 (file)
--- a/libbcachefs/fs-common.c
+++ b/libbcachefs/fs-common.c
@@ -357,6 +357,22 @@ bool bch2_reinherit_attrs(struct bch_inode_unpacked *dst_u,
        return ret;
 }
 
+static int subvol_update_parent(struct btree_trans *trans, u32 subvol, u32 new_parent)
+{
+       struct btree_iter iter;
+       struct bkey_i_subvolume *s =
+               bch2_bkey_get_mut_typed(trans, &iter,
+                       BTREE_ID_subvolumes, POS(0, subvol),
+                       BTREE_ITER_CACHED, subvolume);
+       int ret = PTR_ERR_OR_ZERO(s);
+       if (ret)
+               return ret;
+
+       s->v.fs_path_parent = cpu_to_le32(new_parent);
+       bch2_trans_iter_exit(trans, &iter);
+       return 0;
+}
+
 int bch2_rename_trans(struct btree_trans *trans,
                      subvol_inum src_dir, struct bch_inode_unpacked *src_dir_u,
                      subvol_inum dst_dir, struct bch_inode_unpacked *dst_dir_u,
@@ -418,6 +434,21 @@ int bch2_rename_trans(struct btree_trans *trans,
                        goto err;
        }
 
+       if (src_inode_u->bi_subvol &&
+           dst_dir.subvol != src_inode_u->bi_parent_subvol) {
+               ret = subvol_update_parent(trans, src_inode_u->bi_subvol, dst_dir.subvol);
+               if (ret)
+                       goto err;
+       }
+
+       if (mode == BCH_RENAME_EXCHANGE &&
+           dst_inode_u->bi_subvol &&
+           src_dir.subvol != dst_inode_u->bi_parent_subvol) {
+               ret = subvol_update_parent(trans, dst_inode_u->bi_subvol, src_dir.subvol);
+               if (ret)
+                       goto err;
+       }
+
        /* Can't move across subvolumes, unless it's a subvolume root: */
        if (src_dir.subvol != dst_dir.subvol &&
            (!src_inode_u->bi_subvol ||

diff --git a/libbcachefs/fs.c b/libbcachefs/fs.c
index 4445fa2f53d02b341add2899e7df044150abcee8..093f5404a655a0b5c7a445f4e99cab851efe5fb8 100644 (file)
--- a/libbcachefs/fs.c
+++ b/libbcachefs/fs.c
@@ -710,7 +710,7 @@ err:
                           src_inode,
                           dst_inode);
 
-       return ret;
+       return bch2_err_class(ret);
 }
 
 static void bch2_setattr_copy(struct mnt_idmap *idmap,

diff --git a/libbcachefs/fsck.c b/libbcachefs/fsck.c
index dfd54708d2a0212f4c7263654c849057886d2d2a..3f74b6769a38381468c8e7eaaba1c646b54069aa 100644 (file)
--- a/libbcachefs/fsck.c
+++ b/libbcachefs/fsck.c
@@ -1699,10 +1699,10 @@ static int check_dirent_target(struct btree_trans *trans,
                bkey_reassemble(&n->k_i, d.s_c);
                n->v.d_type = inode_d_type(target);
                if (n->v.d_type == DT_SUBVOL) {
-                       n->v.d_parent_subvol = target->bi_parent_subvol;
-                       n->v.d_child_subvol = target->bi_subvol;
+                       n->v.d_parent_subvol = cpu_to_le32(target->bi_parent_subvol);
+                       n->v.d_child_subvol = cpu_to_le32(target->bi_subvol);
                } else {
-                       n->v.d_inum = target->bi_inum;
+                       n->v.d_inum = cpu_to_le64(target->bi_inum);
                }
 
                ret = bch2_trans_update(trans, iter, &n->k_i, 0);
@@ -1809,7 +1809,7 @@ static int check_dirent_to_subvol(struct btree_trans *trans, struct btree_iter *
                if (ret)
                        goto err;
 
-               n->v.fs_path_parent = le32_to_cpu(parent_subvol);
+               n->v.fs_path_parent = cpu_to_le32(parent_subvol);
        }
 
        u64 target_inum = le64_to_cpu(s.v->inode);

diff --git a/libbcachefs/io_write.c b/libbcachefs/io_write.c
index 13b3514d86511db827370d0d0020a7aa07cd7c27..3fa2cb1d5b13aa3efeb07571879d3e1cb7ed066a 100644 (file)
--- a/libbcachefs/io_write.c
+++ b/libbcachefs/io_write.c
@@ -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;

diff --git a/libbcachefs/journal_io.c b/libbcachefs/journal_io.c
index e31e215ff66d59c5ec7e46b5d312573df46f1fd4..057e7c6113157775366b187aad54c613cd91404b 100644 (file)
--- a/libbcachefs/journal_io.c
+++ b/libbcachefs/journal_io.c
@@ -1506,6 +1506,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(replicas_want,
+                                    READ_ONCE(c->opts.metadata_replicas_required));
 
        rcu_read_lock();
 retry:
@@ -1554,7 +1556,7 @@ done:
 
        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)

diff --git a/libbcachefs/journal_reclaim.c b/libbcachefs/journal_reclaim.c
index f29fd39794ac30b8bc33ea1c121d9278e99bb740..a71550816c30407ba3b86332e1ed8c08b208e068 100644 (file)
--- a/libbcachefs/journal_reclaim.c
+++ b/libbcachefs/journal_reclaim.c
@@ -202,7 +202,7 @@ void bch2_journal_space_available(struct journal *j)
 
        j->can_discard = can_discard;
 
-       if (nr_online < c->opts.metadata_replicas_required) {
+       if (nr_online < metadata_replicas_required(c)) {
                ret = JOURNAL_ERR_insufficient_devices;
                goto out;
        }

diff --git a/libbcachefs/sb-members.c b/libbcachefs/sb-members.c
index a45354d2acde9f3ad0b149247c8ff4c7c869fb15..eff5ce18c69c0600047c1fef688a5980af33c678 100644 (file)
--- a/libbcachefs/sb-members.c
+++ b/libbcachefs/sb-members.c
@@ -421,7 +421,7 @@ void bch2_dev_errors_reset(struct bch_dev *ca)
        m = bch2_members_v2_get_mut(c->disk_sb.sb, ca->dev_idx);
        for (unsigned i = 0; i < ARRAY_SIZE(m->errors_at_reset); i++)
                m->errors_at_reset[i] = cpu_to_le64(atomic64_read(&ca->errors[i]));
-       m->errors_reset_time = ktime_get_real_seconds();
+       m->errors_reset_time = cpu_to_le64(ktime_get_real_seconds());
 
        bch2_write_super(c);
        mutex_unlock(&c->sb_lock);

diff --git a/libbcachefs/super-io.c b/libbcachefs/super-io.c
index d60c7d27a0477cb0de116675671d5c888d8f1c86..36988add581fb57ceb69fd564e770a059f184c42 100644 (file)
--- a/libbcachefs/super-io.c
+++ b/libbcachefs/super-io.c
@@ -717,7 +717,7 @@ retry:
 
        if (IS_ERR(sb->bdev_handle)) {
                ret = PTR_ERR(sb->bdev_handle);
-               goto out;
+               goto err;
        }
        sb->bdev = sb->bdev_handle->bdev;
 

diff --git a/libbcachefs/super.c b/libbcachefs/super.c
index 68704a86f649993fa39de399a65c60d0154678a4..8c6caebf843174f71e7c874c08f15782f983802c 100644 (file)
--- a/libbcachefs/super.c
+++ b/libbcachefs/super.c
@@ -1423,10 +1423,10 @@ bool bch2_dev_state_allowed(struct bch_fs *c, struct bch_dev *ca,
 
                required = max(!(flags & BCH_FORCE_IF_METADATA_DEGRADED)
                               ? c->opts.metadata_replicas
-                              : c->opts.metadata_replicas_required,
+                              : metadata_replicas_required(c),
                               !(flags & BCH_FORCE_IF_DATA_DEGRADED)
                               ? c->opts.data_replicas
-                              : c->opts.data_replicas_required);
+                              : data_replicas_required(c));
 
                return nr_rw >= required;
        case BCH_MEMBER_STATE_failed: