Merge tag 'drm-misc-fixes-2020-11-12' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / fs / fs-writeback.c

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 1492271..e6005c7 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -2184,7 +2184,7 @@ static int __init start_dirtytime_writeback(void)
 __initcall(start_dirtytime_writeback);
 
 int dirtytime_interval_handler(struct ctl_table *table, int write,
-                              void __user *buffer, size_t *lenp, loff_t *ppos)
+                              void *buffer, size_t *lenp, loff_t *ppos)
 {
        int ret;
 
@@ -2321,7 +2321,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)
 
                        wb = locked_inode_to_wb_and_lock_list(inode);
 
-                       WARN(bdi_cap_writeback_dirty(wb->bdi) &&
+                       WARN((wb->bdi->capabilities & BDI_CAP_WRITEBACK) &&
                             !test_bit(WB_registered, &wb->state),
                             "bdi-%s not registered\n", bdi_dev_name(wb->bdi));
 
@@ -2346,7 +2346,8 @@ void __mark_inode_dirty(struct inode *inode, int flags)
                         * to make sure background write-back happens
                         * later.
                         */
-                       if (bdi_cap_writeback_dirty(wb->bdi) && wakeup_bdi)
+                       if (wakeup_bdi &&
+                           (wb->bdi->capabilities & BDI_CAP_WRITEBACK))
                                wb_wakeup_delayed(wb);
                        return;
                }
@@ -2581,7 +2582,7 @@ int write_inode_now(struct inode *inode, int sync)
                .range_end = LLONG_MAX,
        };
 
-       if (!mapping_cap_writeback_dirty(inode->i_mapping))
+       if (!mapping_can_writeback(inode->i_mapping))
                wbc.nr_to_write = 0;
 
        might_sleep();