mm: rename filemap_fdatawrite_range_kick to filemap_flush_range

Rename filemap_fdatawrite_range_kick to filemap_flush_range because it
is the ranged version of filemap_flush.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/sync.c b/fs/sync.c
index 6d8b04e04c3ccc6a255cb408f304fc02f71c8333..1759f6ba36cdcfe14d9aed29199e5151c5d7c7e6 100644 (file)
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -285,8 +285,7 @@ int sync_file_range(struct file *file, loff_t offset, loff_t nbytes,
                        ret = filemap_fdatawrite_range(mapping, offset,
                                        endbyte);
                else
-                       ret = filemap_fdatawrite_range_kick(mapping, offset,
-                                       endbyte);
+                       ret = filemap_flush_range(mapping, offset, endbyte);
                if (ret < 0)
                        goto out;
        }

diff --git a/include/linux/fs.h b/include/linux/fs.h
index c895146c1444be36e0a779df55622cc38c9419ff..a5dbfa20f8d74cc105e3cb7dbc35751f72aca606 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3014,7 +3014,7 @@ extern int __must_check file_fdatawait_range(struct file *file, loff_t lstart,
 extern int __must_check file_check_and_advance_wb_err(struct file *file);
 extern int __must_check file_write_and_wait_range(struct file *file,
                                                loff_t start, loff_t end);
-int filemap_fdatawrite_range_kick(struct address_space *mapping, loff_t start,
+int filemap_flush_range(struct address_space *mapping, loff_t start,
                loff_t end);
 
 static inline int file_write_and_wait(struct file *file)
@@ -3051,8 +3051,8 @@ static inline ssize_t generic_write_sync(struct kiocb *iocb, ssize_t count)
        } else if (iocb->ki_flags & IOCB_DONTCACHE) {
                struct address_space *mapping = iocb->ki_filp->f_mapping;
 
-               filemap_fdatawrite_range_kick(mapping, iocb->ki_pos - count,
-                                             iocb->ki_pos - 1);
+               filemap_flush_range(mapping, iocb->ki_pos - count,
+                               iocb->ki_pos - 1);
        }
 
        return count;

diff --git a/mm/fadvise.c b/mm/fadvise.c
index f1be619f0e58b10d39bf689aff11f6e1185016f0..67028e30aa91902719a9fe8f8c37e924b8ce03e9 100644 (file)
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -111,7 +111,7 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice)
                spin_unlock(&file->f_lock);
                break;
        case POSIX_FADV_DONTNEED:
-               filemap_fdatawrite_range_kick(mapping, offset, endbyte);
+               filemap_flush_range(mapping, offset, endbyte);
 
                /*
                 * First and last FULL page! Partial pages are deliberately

diff --git a/mm/filemap.c b/mm/filemap.c
index f90f5bb2b8251133de9aaed708ebb9454483615b..fa770768ea3a4d649829f40c237f33133b8ce50f 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -419,7 +419,7 @@ int filemap_fdatawrite(struct address_space *mapping)
 EXPORT_SYMBOL(filemap_fdatawrite);
 
 /**
- * filemap_fdatawrite_range_kick - start writeback on a range
+ * filemap_flush_range - start writeback on a range
  * @mapping:   target address_space
  * @start:     index to start writeback on
  * @end:       last (inclusive) index for writeback
@@ -429,12 +429,12 @@ EXPORT_SYMBOL(filemap_fdatawrite);
  *
  * Return: %0 on success, negative error code otherwise.
  */
-int filemap_fdatawrite_range_kick(struct address_space *mapping, loff_t start,
+int filemap_flush_range(struct address_space *mapping, loff_t start,
                                  loff_t end)
 {
        return filemap_writeback(mapping, start, end, WB_SYNC_NONE, NULL);
 }
-EXPORT_SYMBOL_GPL(filemap_fdatawrite_range_kick);
+EXPORT_SYMBOL_GPL(filemap_flush_range);
 
 /**
  * filemap_flush - mostly a non-blocking flush
@@ -447,7 +447,7 @@ EXPORT_SYMBOL_GPL(filemap_fdatawrite_range_kick);
  */
 int filemap_flush(struct address_space *mapping)
 {
-       return filemap_fdatawrite_range_kick(mapping, 0, LLONG_MAX);
+       return filemap_flush_range(mapping, 0, LLONG_MAX);
 }
 EXPORT_SYMBOL(filemap_flush);