Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 08d8e9749e7f0435ba4683b620e8d30d59276b4c

Authored by Fengguang Wu
Committed by Linus Torvalds
1 parent 2c13657910
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 3 changed files with 12 additions and 3 deletions Side-by-side Diff

... ... @@ -199,6 +199,14 @@
199 199 move_expired_inodes(&sb->s_dirty, &sb->s_io, older_than_this);
200 200 }
201 201  
  202 +int sb_has_dirty_inodes(struct super_block *sb)
  203 +{
  204 + return !list_empty(&sb->s_dirty) ||
  205 + !list_empty(&sb->s_io) ||
  206 + !list_empty(&sb->s_more_io);
  207 +}
  208 +EXPORT_SYMBOL(sb_has_dirty_inodes);
  209 +
202 210 /*
203 211 * Write a single inode's dirty pages and inode data out to disk.
204 212 * If `wait' is set, wait on the writeout.
... ... @@ -497,7 +505,7 @@
497 505 restart:
498 506 sb = sb_entry(super_blocks.prev);
499 507 for (; sb != sb_entry(&super_blocks); sb = sb_entry(sb->s_list.prev)) {
500   - if (!list_empty(&sb->s_dirty) || !list_empty(&sb->s_io)) {
  508 + if (sb_has_dirty_inodes(sb)) {
501 509 /* we're making our own get_super here */
502 510 sb->s_count++;
503 511 spin_unlock(&sb_lock);
... ... @@ -2381,14 +2381,14 @@
2381 2381 */
2382 2382 ntfs_commit_inode(vol->mft_ino);
2383 2383 write_inode_now(vol->mft_ino, 1);
2384   - if (!list_empty(&sb->s_dirty)) {
  2384 + if (sb_has_dirty_inodes(sb)) {
2385 2385 const char *s1, *s2;
2386 2386  
2387 2387 mutex_lock(&vol->mft_ino->i_mutex);
2388 2388 truncate_inode_pages(vol->mft_ino->i_mapping, 0);
2389 2389 mutex_unlock(&vol->mft_ino->i_mutex);
2390 2390 write_inode_now(vol->mft_ino, 1);
2391   - if (!list_empty(&sb->s_dirty)) {
  2391 + if (sb_has_dirty_inodes(sb)) {
2392 2392 static const char *_s1 = "inodes";
2393 2393 static const char *_s2 = "";
2394 2394 s1 = _s1;
... ... @@ -1729,6 +1729,7 @@
1729 1729 extern int set_blocksize(struct block_device *, int);
1730 1730 extern int sb_set_blocksize(struct super_block *, int);
1731 1731 extern int sb_min_blocksize(struct super_block *, int);
  1732 +extern int sb_has_dirty_inodes(struct super_block *);
1732 1733  
1733 1734 extern int generic_file_mmap(struct file *, struct vm_area_struct *);
1734 1735 extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);