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
This commit is contained in:
commit
b49199c827
2 changed files with 2 additions and 2 deletions
|
@ -541,7 +541,7 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock,
|
||||||
*ptr++ = cpu_to_be64(bn++);
|
*ptr++ = cpu_to_be64(bn++);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} while (state != ALLOC_DATA);
|
} while ((state != ALLOC_DATA) || !dblock);
|
||||||
|
|
||||||
ip->i_height = height;
|
ip->i_height = height;
|
||||||
gfs2_add_inode_blocks(&ip->i_inode, alloced);
|
gfs2_add_inode_blocks(&ip->i_inode, alloced);
|
||||||
|
|
|
@ -725,7 +725,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
error = -EINVAL;
|
error = -EUSERS;
|
||||||
if (!gfs2_jindex_size(sdp)) {
|
if (!gfs2_jindex_size(sdp)) {
|
||||||
fs_err(sdp, "no journals!\n");
|
fs_err(sdp, "no journals!\n");
|
||||||
goto fail_jindex;
|
goto fail_jindex;
|
||||||
|
|
Loading…
Reference in a new issue