aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-06-09 08:28:43 -0400
committerJens Axboe <jaxboe@fusionio.com>2010-06-11 06:58:08 -0400
commit334132ae921a14ac2b2ba48e174136f7f2c9aae1 (patch)
tree4367a78d60365cc4d8c751c81c06d0b6d736bdbf
parentc5444198ca210498e8ac0ba121b4cd3537aa12f7 (diff)
writeback: add missing requeue_io in writeback_inodes_wb
In "writeback: fix writeback_inodes_wb from writeback_inodes_sb" I accidentally removed the requeue_io if we need to skip a superblock because we can't pin it. Add it back, otherwise we're getting spurious lockups after multiple xfstests runs. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--fs/fs-writeback.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 0079bf59b583..3a066e91ec8d 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -643,8 +643,10 @@ static void writeback_inodes_wb(struct bdi_writeback *wb,
643 643
644 ret = writeback_sb_inodes(sb, wb, wbc); 644 ret = writeback_sb_inodes(sb, wb, wbc);
645 } else { 645 } else {
646 if (!pin_sb_for_writeback(sb)) 646 if (!pin_sb_for_writeback(sb)) {
647 requeue_io(inode);
647 continue; 648 continue;
649 }
648 ret = writeback_sb_inodes(sb, wb, wbc); 650 ret = writeback_sb_inodes(sb, wb, wbc);
649 drop_super(sb); 651 drop_super(sb);
650 } 652 }