diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-06-09 14:28:43 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-11 12:58:08 +0200 |
| commit | 334132ae921a14ac2b2ba48e174136f7f2c9aae1 (patch) | |
| tree | 4367a78d60365cc4d8c751c81c06d0b6d736bdbf /fs | |
| parent | writeback: simplify and split bdi_start_writeback (diff) | |
| download | linux-334132ae921a14ac2b2ba48e174136f7f2c9aae1.tar.xz linux-334132ae921a14ac2b2ba48e174136f7f2c9aae1.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fs-writeback.c | 4 |
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, ret = writeback_sb_inodes(sb, wb, wbc); } else { - if (!pin_sb_for_writeback(sb)) + if (!pin_sb_for_writeback(sb)) { + requeue_io(inode); continue; + } ret = writeback_sb_inodes(sb, wb, wbc); drop_super(sb); } |