diff options
| author | Fengguang Wu <wfg@mail.ustc.edu.cn> | 2007-10-16 23:30:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:43:02 -0700 |
| commit | 08d8e9749e7f0435ba4683b620e8d30d59276b4c (patch) | |
| tree | a973ab68d1f10f02e13f8d536ba0bf2cb8f2ffba | |
| parent | 2c1365791048e8aff42138ed5f6040b3c7824a69 (diff) | |
| download | blackbird-op-linux-08d8e9749e7f0435ba4683b620e8d30d59276b4c.tar.gz blackbird-op-linux-08d8e9749e7f0435ba4683b620e8d30d59276b4c.zip | |
writeback: fix ntfs with sb_has_dirty_inodes()
NTFS's if-condition on dirty inodes is not complete. Fix it with
sb_has_dirty_inodes().
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Ken Chen <kenchen@google.com>
Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/fs-writeback.c | 10 | ||||
| -rw-r--r-- | fs/ntfs/super.c | 4 | ||||
| -rw-r--r-- | include/linux/fs.h | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 1f22fb5217c0..414df43706c7 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -199,6 +199,14 @@ static void queue_io(struct super_block *sb, move_expired_inodes(&sb->s_dirty, &sb->s_io, older_than_this); } +int sb_has_dirty_inodes(struct super_block *sb) +{ + return !list_empty(&sb->s_dirty) || + !list_empty(&sb->s_io) || + !list_empty(&sb->s_more_io); +} +EXPORT_SYMBOL(sb_has_dirty_inodes); + /* * Write a single inode's dirty pages and inode data out to disk. * If `wait' is set, wait on the writeout. @@ -497,7 +505,7 @@ writeback_inodes(struct writeback_control *wbc) restart: sb = sb_entry(super_blocks.prev); for (; sb != sb_entry(&super_blocks); sb = sb_entry(sb->s_list.prev)) { - if (!list_empty(&sb->s_dirty) || !list_empty(&sb->s_io)) { + if (sb_has_dirty_inodes(sb)) { /* we're making our own get_super here */ sb->s_count++; spin_unlock(&sb_lock); diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index ad2124573024..3e76f3b216bc 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -2381,14 +2381,14 @@ static void ntfs_put_super(struct super_block *sb) */ ntfs_commit_inode(vol->mft_ino); write_inode_now(vol->mft_ino, 1); - if (!list_empty(&sb->s_dirty)) { + if (sb_has_dirty_inodes(sb)) { const char *s1, *s2; mutex_lock(&vol->mft_ino->i_mutex); truncate_inode_pages(vol->mft_ino->i_mapping, 0); mutex_unlock(&vol->mft_ino->i_mutex); write_inode_now(vol->mft_ino, 1); - if (!list_empty(&sb->s_dirty)) { + if (sb_has_dirty_inodes(sb)) { static const char *_s1 = "inodes"; static const char *_s2 = ""; s1 = _s1; diff --git a/include/linux/fs.h b/include/linux/fs.h index 0b38a897c114..b70331f9f5b7 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1729,6 +1729,7 @@ extern int bdev_read_only(struct block_device *); extern int set_blocksize(struct block_device *, int); extern int sb_set_blocksize(struct super_block *, int); extern int sb_min_blocksize(struct super_block *, int); +extern int sb_has_dirty_inodes(struct super_block *); extern int generic_file_mmap(struct file *, struct vm_area_struct *); extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); |
