diff options
Diffstat (limited to 'fs/fs-writeback.c')
-rw-r--r-- | fs/fs-writeback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 073657f755d4..e907052eeadb 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
@@ -769,9 +769,9 @@ static long __writeback_inodes_wb(struct bdi_writeback *wb, | |||
769 | struct inode *inode = wb_inode(wb->b_io.prev); | 769 | struct inode *inode = wb_inode(wb->b_io.prev); |
770 | struct super_block *sb = inode->i_sb; | 770 | struct super_block *sb = inode->i_sb; |
771 | 771 | ||
772 | if (!grab_super_passive(sb)) { | 772 | if (!trylock_super(sb)) { |
773 | /* | 773 | /* |
774 | * grab_super_passive() may fail consistently due to | 774 | * trylock_super() may fail consistently due to |
775 | * s_umount being grabbed by someone else. Don't use | 775 | * s_umount being grabbed by someone else. Don't use |
776 | * requeue_io() to avoid busy retrying the inode/sb. | 776 | * requeue_io() to avoid busy retrying the inode/sb. |
777 | */ | 777 | */ |
@@ -779,7 +779,7 @@ static long __writeback_inodes_wb(struct bdi_writeback *wb, | |||
779 | continue; | 779 | continue; |
780 | } | 780 | } |
781 | wrote += writeback_sb_inodes(sb, wb, work); | 781 | wrote += writeback_sb_inodes(sb, wb, work); |
782 | drop_super(sb); | 782 | up_read(&sb->s_umount); |
783 | 783 | ||
784 | /* refer to the same tests at the end of writeback_sb_inodes */ | 784 | /* refer to the same tests at the end of writeback_sb_inodes */ |
785 | if (wrote) { | 785 | if (wrote) { |