Pre-pull patch posting (fixes)
Hi,
Here are a couple of GFS2 fixes. Both are one-liners,
Steve.
PATCH 1/2 GFS2: Fix error code
From: Abhijith Das <[email protected]>
We need this one-liner to signal the mount helper of the 'insufficient journals' condition.
Signed-off-by Abhijith Das <[email protected]>
Signed-off-by Steven Whitehouse <[email protected]>
--- fs/gfs2/ops_fstype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/gfs2/ops_fstype.c +1 -1
@@ -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;
Signature · 1 line
1.6.2.5
PATCH 2/2 GFS2: Fix bmap allocation corner-case bug
This patch solves a corner case during allocation which occurs if both metadata (indirect) and data blocks are required but there is an obstacle in the filesystem (e.g. a resource group header or another allocated block) such that when the allocation is requested only enough blocks for the metadata are returned.
By changing the exit condition of this loop, we ensure that a minimum of one data block will always be returned.
Signed-off-by Steven Whitehouse <[email protected]>
--- fs/gfs2/bmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/gfs2/bmap.c +1 -1
@@ -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);
Signature · 1 line
1.6.2.5