Commit b49199c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Fix bmap allocation corner-case bug
  GFS2: Fix error code
parents 4dfd459b 07ccb7bf

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock, 
				*ptr++ = cpu_to_be64(bn++);

			break;

		}

	} while (state != ALLOC_DATA);

	} while ((state != ALLOC_DATA) || !dblock);



	ip->i_height = height;

	gfs2_add_inode_blocks(&ip->i_inode, alloced);

fs/gfs2/ops_fstype.c

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo) 
		goto fail;

	}



	error = -EINVAL;

	error = -EUSERS;

	if (!gfs2_jindex_size(sdp)) {

		fs_err(sdp, "no journals!\n");

		goto fail_jindex;