diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fs-writeback.c | 6 | ||||
-rw-r--r-- | fs/internal.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 0639024d83a9..c403b66ec83c 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
@@ -319,7 +319,7 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc) | |||
319 | 319 | ||
320 | if (!bdi_cap_writeback_dirty(bdi)) { | 320 | if (!bdi_cap_writeback_dirty(bdi)) { |
321 | list_move(&inode->i_list, &sb->s_dirty); | 321 | list_move(&inode->i_list, &sb->s_dirty); |
322 | if (sb == blockdev_superblock) { | 322 | if (sb_is_blkdev_sb(sb)) { |
323 | /* | 323 | /* |
324 | * Dirty memory-backed blockdev: the ramdisk | 324 | * Dirty memory-backed blockdev: the ramdisk |
325 | * driver does this. Skip just this inode | 325 | * driver does this. Skip just this inode |
@@ -336,14 +336,14 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc) | |||
336 | 336 | ||
337 | if (wbc->nonblocking && bdi_write_congested(bdi)) { | 337 | if (wbc->nonblocking && bdi_write_congested(bdi)) { |
338 | wbc->encountered_congestion = 1; | 338 | wbc->encountered_congestion = 1; |
339 | if (sb != blockdev_superblock) | 339 | if (!sb_is_blkdev_sb(sb)) |
340 | break; /* Skip a congested fs */ | 340 | break; /* Skip a congested fs */ |
341 | list_move(&inode->i_list, &sb->s_dirty); | 341 | list_move(&inode->i_list, &sb->s_dirty); |
342 | continue; /* Skip a congested blockdev */ | 342 | continue; /* Skip a congested blockdev */ |
343 | } | 343 | } |
344 | 344 | ||
345 | if (wbc->bdi && bdi != wbc->bdi) { | 345 | if (wbc->bdi && bdi != wbc->bdi) { |
346 | if (sb != blockdev_superblock) | 346 | if (!sb_is_blkdev_sb(sb)) |
347 | break; /* fs has the wrong queue */ | 347 | break; /* fs has the wrong queue */ |
348 | list_move(&inode->i_list, &sb->s_dirty); | 348 | list_move(&inode->i_list, &sb->s_dirty); |
349 | continue; /* blockdev has wrong queue */ | 349 | continue; /* blockdev has wrong queue */ |
diff --git a/fs/internal.h b/fs/internal.h index c21ecd37b1e7..f662b703bb97 100644 --- a/fs/internal.h +++ b/fs/internal.h | |||
@@ -17,6 +17,8 @@ | |||
17 | extern struct super_block *blockdev_superblock; | 17 | extern struct super_block *blockdev_superblock; |
18 | extern void __init bdev_cache_init(void); | 18 | extern void __init bdev_cache_init(void); |
19 | 19 | ||
20 | #define sb_is_blkdev_sb(sb) ((sb) == blockdev_superblock) | ||
21 | |||
20 | /* | 22 | /* |
21 | * char_dev.c | 23 | * char_dev.c |
22 | */ | 24 | */ |