bcachefs: Rename BCH_WRITE_DONE -> BCH_WRITE_SUBMITTED

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/io_write.c b/fs/bcachefs/io_write.c
index b3b05e9392aea3d13e114ab4060f8dfff387d53f..d31c8d006d979138821a0223dbf6aa9bf0645bd1 100644 (file)
--- a/fs/bcachefs/io_write.c
+++ b/fs/bcachefs/io_write.c
@@ -554,7 +554,7 @@ out:
 err:
        keys->top = keys->keys;
        op->error = ret;
-       op->flags |= BCH_WRITE_DONE;
+       op->flags |= BCH_WRITE_SUBMITTED;
        goto out;
 }
 
@@ -589,7 +589,7 @@ static CLOSURE_CALLBACK(bch2_write_index)
        struct workqueue_struct *wq = index_update_wq(op);
        unsigned long flags;
 
-       if ((op->flags & BCH_WRITE_DONE) &&
+       if ((op->flags & BCH_WRITE_SUBMITTED) &&
            (op->flags & BCH_WRITE_MOVE))
                bch2_bio_free_pages_pool(op->c, &op->wbio.bio);
 
@@ -634,7 +634,7 @@ void bch2_write_point_do_index_updates(struct work_struct *work)
 
                __bch2_write_index(op);
 
-               if (!(op->flags & BCH_WRITE_DONE))
+               if (!(op->flags & BCH_WRITE_SUBMITTED))
                        __bch2_write(op);
                else
                        bch2_write_done(&op->cl);
@@ -1318,7 +1318,7 @@ retry:
                        wbio_init(bio)->put_bio = true;
                        bio->bi_opf = op->wbio.bio.bi_opf;
                } else {
-                       op->flags |= BCH_WRITE_DONE;
+                       op->flags |= BCH_WRITE_SUBMITTED;
                }
 
                op->pos.offset += bio_sectors(bio);
@@ -1332,7 +1332,7 @@ retry:
                                          op->insert_keys.top, true);
 
                bch2_keylist_push(&op->insert_keys);
-               if (op->flags & BCH_WRITE_DONE)
+               if (op->flags & BCH_WRITE_SUBMITTED)
                        break;
                bch2_btree_iter_advance(&iter);
        }
@@ -1347,14 +1347,14 @@ err:
                        op->pos.inode, op->pos.offset << 9,
                        "%s: btree lookup error %s", __func__, bch2_err_str(ret));
                op->error = ret;
-               op->flags |= BCH_WRITE_DONE;
+               op->flags |= BCH_WRITE_SUBMITTED;
        }
 
        bch2_trans_put(trans);
        darray_exit(&buckets);
 
        /* fallback to cow write path? */
-       if (!(op->flags & BCH_WRITE_DONE)) {
+       if (!(op->flags & BCH_WRITE_SUBMITTED)) {
                closure_sync(&op->cl);
                __bch2_nocow_write_done(op);
                op->insert_keys.top = op->insert_keys.keys;
@@ -1410,7 +1410,7 @@ static void __bch2_write(struct bch_write_op *op)
 
        if (unlikely(op->opts.nocow && c->opts.nocow_enabled)) {
                bch2_nocow_write(op);
-               if (op->flags & BCH_WRITE_DONE)
+               if (op->flags & BCH_WRITE_SUBMITTED)
                        goto out_nofs_restore;
        }
 again:
@@ -1465,7 +1465,7 @@ again:
                bch2_alloc_sectors_done_inlined(c, wp);
 err:
                if (ret <= 0) {
-                       op->flags |= BCH_WRITE_DONE;
+                       op->flags |= BCH_WRITE_SUBMITTED;
 
                        if (ret < 0) {
                                if (!(op->flags & BCH_WRITE_ALLOC_NOWAIT))
@@ -1501,7 +1501,7 @@ err:
         * once, as that signals backpressure to the caller.
         */
        if ((op->flags & BCH_WRITE_SYNC) ||
-           (!(op->flags & BCH_WRITE_DONE) &&
+           (!(op->flags & BCH_WRITE_SUBMITTED) &&
             !(op->flags & BCH_WRITE_IN_WORKER))) {
                if (closure_sync_timeout(&op->cl, HZ * 10)) {
                        bch2_print_allocator_stuck(c);
@@ -1510,7 +1510,7 @@ err:
 
                __bch2_write_index(op);
 
-               if (!(op->flags & BCH_WRITE_DONE))
+               if (!(op->flags & BCH_WRITE_SUBMITTED))
                        goto again;
                bch2_write_done(&op->cl);
        } else {
@@ -1532,7 +1532,7 @@ static void bch2_write_data_inline(struct bch_write_op *op, unsigned data_len)
        memset(&op->failed, 0, sizeof(op->failed));
 
        op->flags |= BCH_WRITE_WROTE_DATA_INLINE;
-       op->flags |= BCH_WRITE_DONE;
+       op->flags |= BCH_WRITE_SUBMITTED;
 
        bch2_check_set_feature(op->c, BCH_FEATURE_inline_data);
 

diff --git a/fs/bcachefs/io_write.h b/fs/bcachefs/io_write.h
index 6c276a48f95dc2051f22dbfe00e4181319f1ee76..5400ce94ee57db8fd54e89827d7a9b9b173c1e39 100644 (file)
--- a/fs/bcachefs/io_write.h
+++ b/fs/bcachefs/io_write.h
@@ -33,7 +33,7 @@ void bch2_submit_wbio_replicas(struct bch_write_bio *, struct bch_fs *,
        x(SYNC)                         \
        x(MOVE)                         \
        x(IN_WORKER)                    \
-       x(DONE)                         \
+       x(SUBMITTED)                    \
        x(IO_ERROR)                     \
        x(CONVERT_UNWRITTEN)