Commit a823e458 authored by Jeff Layton's avatar Jeff Layton
Browse files

mm: add file_fdatawait_range and file_write_and_wait 



Necessary now for gfs2_fsync and sync_file_range, but there will
eventually be other callers.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
parent 7e51fe1d

include/linux/fs.h

+10 −1
Original line number Diff line number Diff line
@@ -2544,6 +2544,8 @@ extern int filemap_fdatawait_range(struct address_space *, loff_t lstart, 
				   loff_t lend);

extern bool filemap_range_has_page(struct address_space *, loff_t lstart,

				  loff_t lend);

extern int __must_check file_fdatawait_range(struct file *file, loff_t lstart,

						loff_t lend);

extern int filemap_write_and_wait(struct address_space *mapping);

extern int filemap_write_and_wait_range(struct address_space *mapping,

				        loff_t lstart, loff_t lend);
@@ -2552,12 +2554,19 @@ extern int __filemap_fdatawrite_range(struct address_space *mapping, 
extern int filemap_fdatawrite_range(struct address_space *mapping,

				loff_t start, loff_t end);

extern int filemap_check_errors(struct address_space *mapping);



extern void __filemap_set_wb_err(struct address_space *mapping, int err);



extern int __must_check file_fdatawait_range(struct file *file, loff_t lstart,

						loff_t lend);

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);



static inline int file_write_and_wait(struct file *file)

{

	return file_write_and_wait_range(file, 0, LLONG_MAX);

}



/**

 * filemap_set_wb_err - set a writeback error on an address_space

 * @mapping: mapping in which to set writeback error

mm/filemap.c

+23 −0
Original line number Diff line number Diff line
@@ -475,6 +475,29 @@ int filemap_fdatawait_range(struct address_space *mapping, loff_t start_byte, 
}

EXPORT_SYMBOL(filemap_fdatawait_range);



/**

 * file_fdatawait_range - wait for writeback to complete

 * @file:		file pointing to address space structure to wait for

 * @start_byte:		offset in bytes where the range starts

 * @end_byte:		offset in bytes where the range ends (inclusive)

 *

 * Walk the list of under-writeback pages of the address space that file

 * refers to, in the given range and wait for all of them.  Check error

 * status of the address space vs. the file->f_wb_err cursor and return it.

 *

 * Since the error status of the file is advanced by this function,

 * callers are responsible for checking the return value and handling and/or

 * reporting the error.

 */

int file_fdatawait_range(struct file *file, loff_t start_byte, loff_t end_byte)

{

	struct address_space *mapping = file->f_mapping;



	__filemap_fdatawait_range(mapping, start_byte, end_byte);

	return file_check_and_advance_wb_err(file);

}

EXPORT_SYMBOL(file_fdatawait_range);



/**

 * filemap_fdatawait_keep_errors - wait for writeback without clearing errors

 * @mapping: address space structure to wait for