fs: Introduce i_blocks_per_page

[linux-2.6-microblaze.git] / fs / iomap / buffered-io.c

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index bcfc288..dd07396 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -46,7 +46,7 @@ iomap_page_create(struct inode *inode, struct page *page)
 {
        struct iomap_page *iop = to_iomap_page(page);
 
-       if (iop || i_blocksize(inode) == PAGE_SIZE)
+       if (iop || i_blocks_per_page(inode, page) <= 1)
                return iop;
 
        iop = kmalloc(sizeof(*iop), GFP_NOFS | __GFP_NOFAIL);
@@ -147,7 +147,7 @@ iomap_iop_set_range_uptodate(struct page *page, unsigned off, unsigned len)
        unsigned int i;
 
        spin_lock_irqsave(&iop->uptodate_lock, flags);
-       for (i = 0; i < PAGE_SIZE / i_blocksize(inode); i++) {
+       for (i = 0; i < i_blocks_per_page(inode, page); i++) {
                if (i >= first && i <= last)
                        set_bit(i, iop->uptodate);
                else if (!test_bit(i, iop->uptodate))
@@ -571,13 +571,13 @@ __iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int flags,
 {
        struct iomap_page *iop = iomap_page_create(inode, page);
        loff_t block_size = i_blocksize(inode);
-       loff_t block_start = pos & ~(block_size - 1);
-       loff_t block_end = (pos + len + block_size - 1) & ~(block_size - 1);
+       loff_t block_start = round_down(pos, block_size);
+       loff_t block_end = round_up(pos + len, block_size);
        unsigned from = offset_in_page(pos), to = from + len, poff, plen;
-       int status;
 
        if (PageUptodate(page))
                return 0;
+       ClearPageError(page);
 
        do {
                iomap_adjust_read_range(inode, iop, &block_start,
@@ -594,14 +594,13 @@ __iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, int flags,
                        if (WARN_ON_ONCE(flags & IOMAP_WRITE_F_UNSHARE))
                                return -EIO;
                        zero_user_segments(page, poff, from, to, poff + plen);
-                       iomap_set_range_uptodate(page, poff, plen);
-                       continue;
+               } else {
+                       int status = iomap_read_page_sync(block_start, page,
+                                       poff, plen, srcmap);
+                       if (status)
+                               return status;
                }
-
-               status = iomap_read_page_sync(block_start, page, poff, plen,
-                               srcmap);
-               if (status)
-                       return status;
+               iomap_set_range_uptodate(page, poff, plen);
        } while ((block_start += plen) < block_end);
 
        return 0;
@@ -718,6 +717,7 @@ iomap_write_end_inline(struct inode *inode, struct page *page,
        WARN_ON_ONCE(!PageUptodate(page));
        BUG_ON(pos + copied > PAGE_SIZE - offset_in_page(iomap->inline_data));
 
+       flush_dcache_page(page);
        addr = kmap_atomic(page);
        memcpy(iomap->inline_data + pos, addr + pos, copied);
        kunmap_atomic(addr);
@@ -811,8 +811,6 @@ again:
 
                copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes);
 
-               flush_dcache_page(page);
-
                status = iomap_write_end(inode, pos, bytes, copied, page, iomap,
                                srcmap);
                if (unlikely(status < 0))
@@ -1079,7 +1077,7 @@ iomap_finish_page_writeback(struct inode *inode, struct page *page,
                mapping_set_error(inode->i_mapping, -EIO);
        }
 
-       WARN_ON_ONCE(i_blocksize(inode) < PAGE_SIZE && !iop);
+       WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop);
        WARN_ON_ONCE(iop && atomic_read(&iop->write_count) <= 0);
 
        if (!iop || atomic_dec_and_test(&iop->write_count))
@@ -1375,7 +1373,7 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,
        int error = 0, count = 0, i;
        LIST_HEAD(submit_list);
 
-       WARN_ON_ONCE(i_blocksize(inode) < PAGE_SIZE && !iop);
+       WARN_ON_ONCE(i_blocks_per_page(inode, page) > 1 && !iop);
        WARN_ON_ONCE(iop && atomic_read(&iop->write_count) != 0);
 
        /*