Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[platform/kernel/linux-rpi.git] / fs / iomap / buffered-io.c

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index c5ff13e..41da4f1 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -394,7 +394,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops)
 {
        struct inode *inode = rac->mapping->host;
        loff_t pos = readahead_pos(rac);
-       loff_t length = readahead_length(rac);
+       size_t length = readahead_length(rac);
        struct iomap_readpage_ctx ctx = {
                .rac    = rac,
        };
@@ -402,7 +402,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops)
        trace_iomap_readahead(inode, readahead_count(rac));
 
        while (length > 0) {
-               loff_t ret = iomap_apply(inode, pos, length, 0, ops,
+               ssize_t ret = iomap_apply(inode, pos, length, 0, ops,
                                &ctx, iomap_readahead_actor);
                if (ret <= 0) {
                        WARN_ON_ONCE(ret == 0);
@@ -640,31 +640,6 @@ out_no_page:
        return status;
 }
 
-int
-iomap_set_page_dirty(struct page *page)
-{
-       struct address_space *mapping = page_mapping(page);
-       int newly_dirty;
-
-       if (unlikely(!mapping))
-               return !TestSetPageDirty(page);
-
-       /*
-        * Lock out page's memcg migration to keep PageDirty
-        * synchronized with per-memcg dirty page counters.
-        */
-       lock_page_memcg(page);
-       newly_dirty = !TestSetPageDirty(page);
-       if (newly_dirty)
-               __set_page_dirty(page, mapping, 0);
-       unlock_page_memcg(page);
-
-       if (newly_dirty)
-               __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
-       return newly_dirty;
-}
-EXPORT_SYMBOL_GPL(iomap_set_page_dirty);
-
 static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t len,
                size_t copied, struct page *page)
 {
@@ -684,7 +659,7 @@ static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t len,
        if (unlikely(copied < len && !PageUptodate(page)))
                return 0;
        iomap_set_range_uptodate(page, offset_in_page(pos), len);
-       iomap_set_page_dirty(page);
+       __set_page_dirty_nobuffers(page);
        return copied;
 }