@@ -554,7 +554,7 @@ static void __bch2_write_index(struct bch_write_op *op)
554554err :
555555 keys -> top = keys -> keys ;
556556 op -> error = ret ;
557- op -> flags |= BCH_WRITE_DONE ;
557+ op -> flags |= BCH_WRITE_SUBMITTED ;
558558 goto out ;
559559}
560560
@@ -589,7 +589,7 @@ static CLOSURE_CALLBACK(bch2_write_index)
589589 struct workqueue_struct * wq = index_update_wq (op );
590590 unsigned long flags ;
591591
592- if ((op -> flags & BCH_WRITE_DONE ) &&
592+ if ((op -> flags & BCH_WRITE_SUBMITTED ) &&
593593 (op -> flags & BCH_WRITE_MOVE ))
594594 bch2_bio_free_pages_pool (op -> c , & op -> wbio .bio );
595595
@@ -634,7 +634,7 @@ void bch2_write_point_do_index_updates(struct work_struct *work)
634634
635635 __bch2_write_index (op );
636636
637- if (!(op -> flags & BCH_WRITE_DONE ))
637+ if (!(op -> flags & BCH_WRITE_SUBMITTED ))
638638 __bch2_write (op );
639639 else
640640 bch2_write_done (& op -> cl );
@@ -1318,7 +1318,7 @@ static void bch2_nocow_write(struct bch_write_op *op)
13181318 wbio_init (bio )-> put_bio = true;
13191319 bio -> bi_opf = op -> wbio .bio .bi_opf ;
13201320 } else {
1321- op -> flags |= BCH_WRITE_DONE ;
1321+ op -> flags |= BCH_WRITE_SUBMITTED ;
13221322 }
13231323
13241324 op -> pos .offset += bio_sectors (bio );
@@ -1332,7 +1332,7 @@ static void bch2_nocow_write(struct bch_write_op *op)
13321332 op -> insert_keys .top , true);
13331333
13341334 bch2_keylist_push (& op -> insert_keys );
1335- if (op -> flags & BCH_WRITE_DONE )
1335+ if (op -> flags & BCH_WRITE_SUBMITTED )
13361336 break ;
13371337 bch2_btree_iter_advance (& iter );
13381338 }
@@ -1347,14 +1347,14 @@ static void bch2_nocow_write(struct bch_write_op *op)
13471347 op -> pos .inode , op -> pos .offset << 9 ,
13481348 "%s: btree lookup error %s" , __func__ , bch2_err_str (ret ));
13491349 op -> error = ret ;
1350- op -> flags |= BCH_WRITE_DONE ;
1350+ op -> flags |= BCH_WRITE_SUBMITTED ;
13511351 }
13521352
13531353 bch2_trans_put (trans );
13541354 darray_exit (& buckets );
13551355
13561356 /* fallback to cow write path? */
1357- if (!(op -> flags & BCH_WRITE_DONE )) {
1357+ if (!(op -> flags & BCH_WRITE_SUBMITTED )) {
13581358 closure_sync (& op -> cl );
13591359 __bch2_nocow_write_done (op );
13601360 op -> insert_keys .top = op -> insert_keys .keys ;
@@ -1410,7 +1410,7 @@ static void __bch2_write(struct bch_write_op *op)
14101410
14111411 if (unlikely (op -> opts .nocow && c -> opts .nocow_enabled )) {
14121412 bch2_nocow_write (op );
1413- if (op -> flags & BCH_WRITE_DONE )
1413+ if (op -> flags & BCH_WRITE_SUBMITTED )
14141414 goto out_nofs_restore ;
14151415 }
14161416again :
@@ -1465,7 +1465,7 @@ static void __bch2_write(struct bch_write_op *op)
14651465 bch2_alloc_sectors_done_inlined (c , wp );
14661466err :
14671467 if (ret <= 0 ) {
1468- op -> flags |= BCH_WRITE_DONE ;
1468+ op -> flags |= BCH_WRITE_SUBMITTED ;
14691469
14701470 if (ret < 0 ) {
14711471 if (!(op -> flags & BCH_WRITE_ALLOC_NOWAIT ))
@@ -1501,7 +1501,7 @@ static void __bch2_write(struct bch_write_op *op)
15011501 * once, as that signals backpressure to the caller.
15021502 */
15031503 if ((op -> flags & BCH_WRITE_SYNC ) ||
1504- (!(op -> flags & BCH_WRITE_DONE ) &&
1504+ (!(op -> flags & BCH_WRITE_SUBMITTED ) &&
15051505 !(op -> flags & BCH_WRITE_IN_WORKER ))) {
15061506 if (closure_sync_timeout (& op -> cl , HZ * 10 )) {
15071507 bch2_print_allocator_stuck (c );
@@ -1510,7 +1510,7 @@ static void __bch2_write(struct bch_write_op *op)
15101510
15111511 __bch2_write_index (op );
15121512
1513- if (!(op -> flags & BCH_WRITE_DONE ))
1513+ if (!(op -> flags & BCH_WRITE_SUBMITTED ))
15141514 goto again ;
15151515 bch2_write_done (& op -> cl );
15161516 } else {
@@ -1532,7 +1532,7 @@ static void bch2_write_data_inline(struct bch_write_op *op, unsigned data_len)
15321532 memset (& op -> failed , 0 , sizeof (op -> failed ));
15331533
15341534 op -> flags |= BCH_WRITE_WROTE_DATA_INLINE ;
1535- op -> flags |= BCH_WRITE_DONE ;
1535+ op -> flags |= BCH_WRITE_SUBMITTED ;
15361536
15371537 bch2_check_set_feature (op -> c , BCH_FEATURE_inline_data );
15381538
0 commit comments