Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef51c976 authored by Mark Fasheh's avatar Mark Fasheh Committed by Linus Torvalds
Browse files

Remove do_sync_file_range() 



Remove do_sync_file_range() and convert callers to just use
do_sync_mapping_range().

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 524e6752

drivers/md/bitmap.c

+4 −4
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ int bitmap_create(mddev_t *mddev) 
	bitmap->offset = mddev->bitmap_offset;

	if (file) {

		get_file(file);

		do_sync_file_range(file, 0, LLONG_MAX,

		do_sync_mapping_range(file->f_mapping, 0, LLONG_MAX,

				      SYNC_FILE_RANGE_WAIT_BEFORE |

				      SYNC_FILE_RANGE_WRITE |

				      SYNC_FILE_RANGE_WAIT_AFTER);

fs/sync.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes, 
			!S_ISLNK(i_mode))

		goto out_put;



	ret = do_sync_file_range(file, offset, endbyte, flags);

	ret = do_sync_mapping_range(file->f_mapping, offset, endbyte, flags);

out_put:

	fput_light(file, fput_needed);

out:

include/linux/fs.h

+0 −5
Original line number Diff line number Diff line
@@ -849,11 +849,6 @@ extern int fcntl_getlease(struct file *filp); 
/* fs/sync.c */

extern int do_sync_mapping_range(struct address_space *mapping, loff_t offset,

			loff_t endbyte, unsigned int flags);

static inline int do_sync_file_range(struct file *file, loff_t offset,

			loff_t endbyte, unsigned int flags)

{

	return do_sync_mapping_range(file->f_mapping, offset, endbyte, flags);

}



/* fs/locks.c */

extern void locks_init_lock(struct file_lock *);

mm/filemap.c

+4 −4
Original line number Diff line number Diff line
@@ -2309,7 +2309,7 @@ __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov, 
		 * semantics.

		 */

		endbyte = pos + written_buffered - written - 1;

		err = do_sync_file_range(file, pos, endbyte,

		err = do_sync_mapping_range(file->f_mapping, pos, endbyte,

					    SYNC_FILE_RANGE_WAIT_BEFORE|

					    SYNC_FILE_RANGE_WRITE|

					    SYNC_FILE_RANGE_WAIT_AFTER);