iomap: Clean up __generic_write_end calling (dbc582b6) · Commits · 戴 / test

fs/iomap.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -730,13 +730,11 @@ __iomap_write_end(struct inode *inode, loff_t pos, unsigned len,
		* uptodate page as a zero-length write, and force the caller to redo
		* the whole thing.
		*/
		if (unlikely(copied < len && !PageUptodate(page))) {
		copied = 0;
		} else {
		if (unlikely(copied < len && !PageUptodate(page)))
		return 0;
		iomap_set_range_uptodate(page, offset_in_page(pos), len);
		iomap_set_page_dirty(page);
		}
		return __generic_write_end(inode, pos, copied, page);
		return copied;
		}

		static int
		@@ -753,7 +751,6 @@ iomap_write_end_inline(struct inode inode, struct page page,
		kunmap_atomic(addr);

		mark_inode_dirty(inode);
		__generic_write_end(inode, pos, copied, page);
		return copied;
		}

		@@ -766,12 +763,13 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len,
		if (iomap->type == IOMAP_INLINE) {
		ret = iomap_write_end_inline(inode, page, iomap, pos, copied);
		} else if (iomap->flags & IOMAP_F_BUFFER_HEAD) {
		ret = generic_write_end(NULL, inode->i_mapping, pos, len,
		copied, page, NULL);
		ret = block_write_end(NULL, inode->i_mapping, pos, len, copied,
		page, NULL);
		} else {
		ret = __iomap_write_end(inode, pos, len, copied, page, iomap);
		}

		ret = __generic_write_end(inode, pos, ret, page);
		if (iomap->page_done)
		iomap->page_done(inode, pos, copied, page, iomap);