mirror of
https://github.com/versity/scoutfs.git
synced 2025-12-23 05:25:18 +00:00
merge conflict from zab/shrink cleanup
This commit is contained in:
@@ -2362,7 +2362,6 @@ int scoutfs_item_write_done(struct super_block *sb)
|
|||||||
atomic64_inc(&cinf->read_dirty_barrier);
|
atomic64_inc(&cinf->read_dirty_barrier);
|
||||||
smp_mb__after_atomic();
|
smp_mb__after_atomic();
|
||||||
|
|
||||||
retry:
|
|
||||||
spin_lock(&cinf->dirty_lock);
|
spin_lock(&cinf->dirty_lock);
|
||||||
while ((pg = list_first_entry_or_null(&cinf->dirty_list, struct cached_page, dirty_head))) {
|
while ((pg = list_first_entry_or_null(&cinf->dirty_list, struct cached_page, dirty_head))) {
|
||||||
if (write_trylock(&pg->rwlock)) {
|
if (write_trylock(&pg->rwlock)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user