From de2b9a1830fecd5d8b5ec6a53a235cc76d912f1c Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Tue, 8 May 2007 00:27:10 -0700
Subject: [PATCH] --- yaml --- r: 54617 b: refs/heads/master c:
 ef51c97623b94f51e439ac91d2736aab3d1b6594 h: refs/heads/master i:   54615:
 69a6b243c97a72cc9c40193d1ad6b743907eb588 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/bitmap.c | 8 ++++----
 trunk/fs/sync.c           | 2 +-
 trunk/include/linux/fs.h  | 5 -----
 trunk/mm/filemap.c        | 8 ++++----
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 2eec75a2f84b..3ad343aa3aa5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 524e6752912a891a396a9cf74c5d7d60fff5510a
+refs/heads/master: ef51c97623b94f51e439ac91d2736aab3d1b6594
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index e61e0efe9ec7..5a4a74c1097c 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -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);
diff --git a/trunk/fs/sync.c b/trunk/fs/sync.c
index 5cb9e7e43383..2f97576355b8 100644
--- a/trunk/fs/sync.c
+++ b/trunk/fs/sync.c
@@ -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:
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 527a09a82297..7cf0c54a46a7 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -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 *);
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 3e49fe13d6ac..9cbf4fea4a59 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -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,