1 files changed, 9 insertions, 6 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index e1cca770688f..72e46e6f0d9a 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -522,12 +522,17 @@ int filemap_fdatawait(struct address_space *mapping)
 }
 EXPORT_SYMBOL(filemap_fdatawait);
 
+static bool mapping_needs_writeback(struct address_space *mapping)
+{
+        return (!dax_mapping(mapping) && mapping->nrpages) ||
+            (dax_mapping(mapping) && mapping->nrexceptional);
+}
+
 int filemap_write_and_wait(struct address_space *mapping)
 {
         int err = 0;
 
-        if ((!dax_mapping(mapping) && mapping->nrpages) ||
-            (dax_mapping(mapping) && mapping->nrexceptional)) {
+        if (mapping_needs_writeback(mapping)) {
                 err = filemap_fdatawrite(mapping);
                 /*
                  * Even if the above returned error, the pages may be
@@ -566,8 +571,7 @@ int filemap_write_and_wait_range(struct address_space *mapping,
 {
         int err = 0;
 
-        if ((!dax_mapping(mapping) && mapping->nrpages) ||
-            (dax_mapping(mapping) && mapping->nrexceptional)) {
+        if (mapping_needs_writeback(mapping)) {
                 err = __filemap_fdatawrite_range(mapping, lstart, lend,
                                                  WB_SYNC_ALL);
                 /* See comment of filemap_write_and_wait() */
@@ -656,8 +660,7 @@ int file_write_and_wait_range(struct file *file, loff_t lstart, loff_t lend)
         int err = 0, err2;
         struct address_space *mapping = file->f_mapping;
 
-        if ((!dax_mapping(mapping) && mapping->nrpages) ||
-            (dax_mapping(mapping) && mapping->nrexceptional)) {
+        if (mapping_needs_writeback(mapping)) {
                 err = __filemap_fdatawrite_range(mapping, lstart, lend,
                                                  WB_SYNC_ALL);
                 /* See comment of filemap_write_and_wait() */