diff options
| author | Christoph Hellwig <hch@lst.de> | 2009-09-30 22:16:33 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2009-12-10 15:02:50 +0100 |
| commit | 94004ed726f38a841cc51f97c4a3f9eda9fbd0d9 (patch) | |
| tree | 786689e9fc9e686a5b54c1a1b1efcbb7d043b5ab /fs | |
| parent | 6b2f3d1f769be5779b479c37800229d9a4809fc3 (diff) | |
| download | linux-stable-94004ed726f38a841cc51f97c4a3f9eda9fbd0d9.tar.gz linux-stable-94004ed726f38a841cc51f97c4a3f9eda9fbd0d9.tar.bz2 linux-stable-94004ed726f38a841cc51f97c4a3f9eda9fbd0d9.zip | |
kill wait_on_page_writeback_range
All callers really want the more logical filemap_fdatawait_range interface,
so convert them to use it and merge wait_on_page_writeback_range into
filemap_fdatawait_range.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd2/commit.c | 2 | ||||
| -rw-r--r-- | fs/sync.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index d4cfd6d2779e..c5edc13ccdd0 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -286,7 +286,7 @@ static int journal_finish_inode_data_buffers(journal_t *journal, if (err) { /* * Because AS_EIO is cleared by - * wait_on_page_writeback_range(), set it again so + * filemap_fdatawait_range(), set it again so * that user process can get -EIO from fsync(). */ set_bit(AS_EIO, diff --git a/fs/sync.c b/fs/sync.c index b75ca68dc081..36752a683481 100644 --- a/fs/sync.c +++ b/fs/sync.c @@ -453,9 +453,7 @@ int do_sync_mapping_range(struct address_space *mapping, loff_t offset, ret = 0; if (flags & SYNC_FILE_RANGE_WAIT_BEFORE) { - ret = wait_on_page_writeback_range(mapping, - offset >> PAGE_CACHE_SHIFT, - endbyte >> PAGE_CACHE_SHIFT); + ret = filemap_fdatawait_range(mapping, offset, endbyte); if (ret < 0) goto out; } @@ -468,9 +466,7 @@ int do_sync_mapping_range(struct address_space *mapping, loff_t offset, } if (flags & SYNC_FILE_RANGE_WAIT_AFTER) { - ret = wait_on_page_writeback_range(mapping, - offset >> PAGE_CACHE_SHIFT, - endbyte >> PAGE_CACHE_SHIFT); + ret = filemap_fdatawait_range(mapping, offset, endbyte); } out: return ret; |