Skip to content

Commit c28d67b

Browse files
Christoph Hellwigbrauner
authored andcommitted
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> Link: https://patch.msgid.link/20251024080431.324236-11-hch@lst.de Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 45cbce5 commit c28d67b

4 files changed

Lines changed: 9 additions & 10 deletions

File tree

fs/sync.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,7 @@ int sync_file_range(struct file *file, loff_t offset, loff_t nbytes,
285285
ret = filemap_fdatawrite_range(mapping, offset,
286286
endbyte);
287287
else
288-
ret = filemap_fdatawrite_range_kick(mapping, offset,
289-
endbyte);
288+
ret = filemap_flush_range(mapping, offset, endbyte);
290289
if (ret < 0)
291290
goto out;
292291
}

include/linux/fs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3014,7 +3014,7 @@ extern int __must_check file_fdatawait_range(struct file *file, loff_t lstart,
30143014
extern int __must_check file_check_and_advance_wb_err(struct file *file);
30153015
extern int __must_check file_write_and_wait_range(struct file *file,
30163016
loff_t start, loff_t end);
3017-
int filemap_fdatawrite_range_kick(struct address_space *mapping, loff_t start,
3017+
int filemap_flush_range(struct address_space *mapping, loff_t start,
30183018
loff_t end);
30193019

30203020
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)
30513051
} else if (iocb->ki_flags & IOCB_DONTCACHE) {
30523052
struct address_space *mapping = iocb->ki_filp->f_mapping;
30533053

3054-
filemap_fdatawrite_range_kick(mapping, iocb->ki_pos - count,
3055-
iocb->ki_pos - 1);
3054+
filemap_flush_range(mapping, iocb->ki_pos - count,
3055+
iocb->ki_pos - 1);
30563056
}
30573057

30583058
return count;

mm/fadvise.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice)
111111
spin_unlock(&file->f_lock);
112112
break;
113113
case POSIX_FADV_DONTNEED:
114-
filemap_fdatawrite_range_kick(mapping, offset, endbyte);
114+
filemap_flush_range(mapping, offset, endbyte);
115115

116116
/*
117117
* First and last FULL page! Partial pages are deliberately

mm/filemap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ int filemap_fdatawrite(struct address_space *mapping)
419419
EXPORT_SYMBOL(filemap_fdatawrite);
420420

421421
/**
422-
* filemap_fdatawrite_range_kick - start writeback on a range
422+
* filemap_flush_range - start writeback on a range
423423
* @mapping: target address_space
424424
* @start: index to start writeback on
425425
* @end: last (inclusive) index for writeback
@@ -429,12 +429,12 @@ EXPORT_SYMBOL(filemap_fdatawrite);
429429
*
430430
* Return: %0 on success, negative error code otherwise.
431431
*/
432-
int filemap_fdatawrite_range_kick(struct address_space *mapping, loff_t start,
432+
int filemap_flush_range(struct address_space *mapping, loff_t start,
433433
loff_t end)
434434
{
435435
return filemap_writeback(mapping, start, end, WB_SYNC_NONE, NULL);
436436
}
437-
EXPORT_SYMBOL_GPL(filemap_fdatawrite_range_kick);
437+
EXPORT_SYMBOL_GPL(filemap_flush_range);
438438

439439
/**
440440
* filemap_flush - mostly a non-blocking flush
@@ -447,7 +447,7 @@ EXPORT_SYMBOL_GPL(filemap_fdatawrite_range_kick);
447447
*/
448448
int filemap_flush(struct address_space *mapping)
449449
{
450-
return filemap_fdatawrite_range_kick(mapping, 0, LLONG_MAX);
450+
return filemap_flush_range(mapping, 0, LLONG_MAX);
451451
}
452452
EXPORT_SYMBOL(filemap_flush);
453453

0 commit comments

Comments
 (0)