diff options
Diffstat (limited to 'fs/fs-writeback.c')
-rw-r--r-- | fs/fs-writeback.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index a9ee474f9691..e5eaa62fd17f 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
@@ -652,18 +652,6 @@ void sync_inodes_sb(struct super_block *sb, int wait) | |||
652 | sync_sb_inodes(sb, &wbc); | 652 | sync_sb_inodes(sb, &wbc); |
653 | } | 653 | } |
654 | 654 | ||
655 | /* | ||
656 | * Rather lame livelock avoidance. | ||
657 | */ | ||
658 | static void set_sb_syncing(int val) | ||
659 | { | ||
660 | struct super_block *sb; | ||
661 | spin_lock(&sb_lock); | ||
662 | list_for_each_entry_reverse(sb, &super_blocks, s_list) | ||
663 | sb->s_syncing = val; | ||
664 | spin_unlock(&sb_lock); | ||
665 | } | ||
666 | |||
667 | /** | 655 | /** |
668 | * sync_inodes - writes all inodes to disk | 656 | * sync_inodes - writes all inodes to disk |
669 | * @wait: wait for completion | 657 | * @wait: wait for completion |
@@ -690,9 +678,6 @@ static void __sync_inodes(int wait) | |||
690 | spin_lock(&sb_lock); | 678 | spin_lock(&sb_lock); |
691 | restart: | 679 | restart: |
692 | list_for_each_entry(sb, &super_blocks, s_list) { | 680 | list_for_each_entry(sb, &super_blocks, s_list) { |
693 | if (sb->s_syncing) | ||
694 | continue; | ||
695 | sb->s_syncing = 1; | ||
696 | sb->s_count++; | 681 | sb->s_count++; |
697 | spin_unlock(&sb_lock); | 682 | spin_unlock(&sb_lock); |
698 | down_read(&sb->s_umount); | 683 | down_read(&sb->s_umount); |
@@ -710,13 +695,10 @@ restart: | |||
710 | 695 | ||
711 | void sync_inodes(int wait) | 696 | void sync_inodes(int wait) |
712 | { | 697 | { |
713 | set_sb_syncing(0); | ||
714 | __sync_inodes(0); | 698 | __sync_inodes(0); |
715 | 699 | ||
716 | if (wait) { | 700 | if (wait) |
717 | set_sb_syncing(0); | ||
718 | __sync_inodes(1); | 701 | __sync_inodes(1); |
719 | } | ||
720 | } | 702 | } |
721 | 703 | ||
722 | /** | 704 | /** |