mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
Remove do_sync_file_range()
Remove do_sync_file_range() and convert callers to just use do_sync_mapping_range(). Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
524e675291
commit
ef51c97623
4 changed files with 9 additions and 14 deletions
|
@ -1456,10 +1456,10 @@ int bitmap_create(mddev_t *mddev)
|
|||
bitmap->offset = mddev->bitmap_offset;
|
||||
if (file) {
|
||||
get_file(file);
|
||||
do_sync_file_range(file, 0, LLONG_MAX,
|
||||
SYNC_FILE_RANGE_WAIT_BEFORE |
|
||||
SYNC_FILE_RANGE_WRITE |
|
||||
SYNC_FILE_RANGE_WAIT_AFTER);
|
||||
do_sync_mapping_range(file->f_mapping, 0, LLONG_MAX,
|
||||
SYNC_FILE_RANGE_WAIT_BEFORE |
|
||||
SYNC_FILE_RANGE_WRITE |
|
||||
SYNC_FILE_RANGE_WAIT_AFTER);
|
||||
}
|
||||
/* read superblock from bitmap file (this sets bitmap->chunksize) */
|
||||
err = bitmap_read_sb(bitmap);
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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 *);
|
||||
|
|
|
@ -2309,10 +2309,10 @@ __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,
|
||||
SYNC_FILE_RANGE_WAIT_BEFORE|
|
||||
SYNC_FILE_RANGE_WRITE|
|
||||
SYNC_FILE_RANGE_WAIT_AFTER);
|
||||
err = do_sync_mapping_range(file->f_mapping, pos, endbyte,
|
||||
SYNC_FILE_RANGE_WAIT_BEFORE|
|
||||
SYNC_FILE_RANGE_WRITE|
|
||||
SYNC_FILE_RANGE_WAIT_AFTER);
|
||||
if (err == 0) {
|
||||
written = written_buffered;
|
||||
invalidate_mapping_pages(mapping,
|
||||
|
|
Loading…
Reference in a new issue