Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
cde1321b · Linus Torvalds · ba599be9 · d0126f8e · cde1321b
Commit cde1321b authored Nov 03, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

fs/ext2/dir.c fs/ext2/dir.c +2 -1

No files found.
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -275,7 +275,8 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
 				   "bad page in #%lu",
 				   inode->i_ino);
 			filp->f_pos += PAGE_CACHE_SIZE - offset;
-			continue;
+			ret = -EIO;
+			goto done;
 		}
 		kaddr = page_address(page);
 		if (need_revalidate) {