Commit 0056e65f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

romfs_readpage: don't report errors for pages beyond i_size 



We zero-fill them like we are supposed to, and that's all fine.  It's
only an error if the 'romfs_copyfrom()' routine isn't able to fill the
data that is supposed to be there.

Most of the patch is really just re-organizing the code a bit, and using
separate variables for the error value and for how much of the page we
actually filled from the filesystem.

Reported-and-tested-by: default avatarChris Fester <cfester@wms.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Matt Waddel <matt.waddel@freescale.com>
Cc: Greg Ungerer <gerg@snapgear.com>
Signed-of-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 660fc1f4

fs/romfs/inode.c

+23 −14
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ static int 
romfs_readpage(struct file *file, struct page * page)

{

	struct inode *inode = page->mapping->host;

	loff_t offset, avail, readlen;

	loff_t offset, size;

	unsigned long filled;

	void *buf;

	int result = -EIO;
@@ -430,21 +431,29 @@ romfs_readpage(struct file *file, struct page * page) 


	/* 32 bit warning -- but not for us :) */

	offset = page_offset(page);

	if (offset < i_size_read(inode)) {

		avail = inode->i_size-offset;

		readlen = min_t(unsigned long, avail, PAGE_SIZE);

		if (romfs_copyfrom(inode, buf, ROMFS_I(inode)->i_dataoffset+offset, readlen) == readlen) {

			if (readlen < PAGE_SIZE) {

				memset(buf + readlen,0,PAGE_SIZE-readlen);

			}

			SetPageUptodate(page);

	size = i_size_read(inode);

	filled = 0;

	result = 0;

		}

	}

	if (result) {

		memset(buf, 0, PAGE_SIZE);

	if (offset < size) {

		unsigned long readlen;



		size -= offset;

		readlen = size > PAGE_SIZE ? PAGE_SIZE : size;



		filled = romfs_copyfrom(inode, buf, ROMFS_I(inode)->i_dataoffset+offset, readlen);



		if (filled != readlen) {

			SetPageError(page);

			filled = 0;

			result = -EIO;

		}

	}



	if (filled < PAGE_SIZE)

		memset(buf + filled, 0, PAGE_SIZE-filled);



	if (!result)

		SetPageUptodate(page);

	flush_dcache_page(page);



	unlock_page(page);

CRA Git | Maintained and supported by SUSTech CRA and CCSE