Commit 0cfc11ed authored by Carsten Otte's avatar Carsten Otte Committed by Linus Torvalds
Browse files

[PATCH] fix xip sparse file handling in ext2 



Oliver Paukstadt from our test department is testing the xip patches in
Linus' git-tree.  He found a problem that shows when reading a file that
contains sparse blocks (holes) on a -o xip mounted ext2 filesystem: the
BUG_ON() in fs/ext2/xip.c:40 triggers where it should not.  The problem was
introduced by a cleanup in my previous patch, this patch fixes it.

Signed-off-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1872bceb

fs/ext2/xip.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ __ext2_get_sector(struct inode *inode, sector_t offset, int create, 
	*result = tmp.b_blocknr;



	/* did we get a sparse block (hole in the file)? */

	if (!(*result)) {

	if (!tmp.b_blocknr && !rc) {

		BUG_ON(create);

		rc = -ENODATA;

	}