@@ -1563,7 +1563,8 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
1563
1563
*/
1564
1564
ret = for_each_btree_key (trans , iter , BTREE_ID_snapshots , POS_MIN , 0 , k ,
1565
1565
check_should_delete_snapshot (trans , k , & delete_leaves , & delete_interior ));
1566
- bch_err_msg (c , ret , "walking snapshots" );
1566
+ if (!bch2_err_matches (ret , EROFS ))
1567
+ bch_err_msg (c , ret , "walking snapshots" );
1567
1568
if (ret )
1568
1569
goto err ;
1569
1570
@@ -1602,15 +1603,17 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
1602
1603
1603
1604
bch2_disk_reservation_put (c , & res );
1604
1605
1605
- bch_err_msg (c , ret , "deleting keys from dying snapshots" );
1606
+ if (!bch2_err_matches (ret , EROFS ))
1607
+ bch_err_msg (c , ret , "deleting keys from dying snapshots" );
1606
1608
if (ret )
1607
1609
goto err ;
1608
1610
}
1609
1611
1610
1612
darray_for_each (delete_leaves , i ) {
1611
1613
ret = commit_do (trans , NULL , NULL , 0 ,
1612
1614
bch2_snapshot_node_delete (trans , * i ));
1613
- bch_err_msg (c , ret , "deleting snapshot %u" , * i );
1615
+ if (!bch2_err_matches (ret , EROFS ))
1616
+ bch_err_msg (c , ret , "deleting snapshot %u" , * i );
1614
1617
if (ret )
1615
1618
goto err ;
1616
1619
}
@@ -1630,15 +1633,17 @@ int bch2_delete_dead_snapshots(struct bch_fs *c)
1630
1633
darray_for_each (delete_interior , i ) {
1631
1634
ret = commit_do (trans , NULL , NULL , 0 ,
1632
1635
bch2_snapshot_node_delete (trans , i -> id ));
1633
- bch_err_msg (c , ret , "deleting snapshot %u" , i -> id );
1636
+ if (!bch2_err_matches (ret , EROFS ))
1637
+ bch_err_msg (c , ret , "deleting snapshot %u" , i -> id );
1634
1638
if (ret )
1635
1639
goto err ;
1636
1640
}
1637
1641
err :
1638
1642
darray_exit (& delete_interior );
1639
1643
darray_exit (& delete_leaves );
1640
1644
bch2_trans_put (trans );
1641
- bch_err_fn (c , ret );
1645
+ if (!bch2_err_matches (ret , EROFS ))
1646
+ bch_err_fn (c , ret );
1642
1647
return ret ;
1643
1648
}
1644
1649
0 commit comments