Commit ddf8f376 authored by Ira Weiny's avatar Ira Weiny Committed by Linus Torvalds
Browse files

mm/filemap.c: clean up filemap_write_and_wait() 

At some point filemap_write_and_wait() and
filemap_write_and_wait_range() got the exact same implementation with
the exception of the range being specified in *_range()

Similar to other functions in fs.h which call *_range(..., 0,
LLONG_MAX), change filemap_write_and_wait() to be a static inline which
calls filemap_write_and_wait_range()

Link: http://lkml.kernel.org/r/20191129160713.30892-1-ira.weiny@intel.com


Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5b57b8f2

include/linux/fs.h

+5 −1
Original line number Diff line number Diff line
@@ -2737,7 +2737,6 @@ static inline int filemap_fdatawait(struct address_space *mapping) 


extern bool filemap_range_has_page(struct address_space *, 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);

extern int __filemap_fdatawrite_range(struct address_space *mapping,
@@ -2747,6 +2746,11 @@ extern int filemap_fdatawrite_range(struct address_space *mapping, 
extern int filemap_check_errors(struct address_space *mapping);

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



static inline int filemap_write_and_wait(struct address_space *mapping)

{

	return filemap_write_and_wait_range(mapping, 0, LLONG_MAX);

}



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

mm/filemap.c

+6 −28
Original line number Diff line number Diff line
@@ -632,33 +632,6 @@ static bool mapping_needs_writeback(struct address_space *mapping) 
	return mapping->nrpages;

}



int filemap_write_and_wait(struct address_space *mapping)

{

	int err = 0;



	if (mapping_needs_writeback(mapping)) {

		err = filemap_fdatawrite(mapping);

		/*

		 * Even if the above returned error, the pages may be

		 * written partially (e.g. -ENOSPC), so we wait for it.

		 * But the -EIO is special case, it may indicate the worst

		 * thing (e.g. bug) happened, so we avoid waiting for it.

		 */

		if (err != -EIO) {

			int err2 = filemap_fdatawait(mapping);

			if (!err)

				err = err2;

		} else {

			/* Clear any previously stored errors */

			filemap_check_errors(mapping);

		}

	} else {

		err = filemap_check_errors(mapping);

	}

	return err;

}

EXPORT_SYMBOL(filemap_write_and_wait);



/**

 * filemap_write_and_wait_range - write out & wait on a file range

 * @mapping:	the address_space for the pages
@@ -680,7 +653,12 @@ int filemap_write_and_wait_range(struct address_space *mapping, 
	if (mapping_needs_writeback(mapping)) {

		err = __filemap_fdatawrite_range(mapping, lstart, lend,

						 WB_SYNC_ALL);

		/* See comment of filemap_write_and_wait() */

		/*

		 * Even if the above returned error, the pages may be

		 * written partially (e.g. -ENOSPC), so we wait for it.

		 * But the -EIO is special case, it may indicate the worst

		 * thing (e.g. bug) happened, so we avoid waiting for it.

		 */

		if (err != -EIO) {

			int err2 = filemap_fdatawait_range(mapping,

						lstart, lend);

CRA Git | Maintained and supported by SUSTech CRA and CCSE