diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2012-11-13 14:50:35 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-11-13 14:50:35 +0000 |
| commit | aa8920c96897dd82f0520f9e7db7311b42547ce6 (patch) | |
| tree | 2f3c7eea4e11fd7c2eb59f7744edee3802fe5c35 /fs/gfs2 | |
| parent | 4327a9bf71f4b021b675e01f24fefc647cff7513 (diff) | |
| download | linux-aa8920c96897dd82f0520f9e7db7311b42547ce6.tar.gz linux-aa8920c96897dd82f0520f9e7db7311b42547ce6.tar.bz2 linux-aa8920c96897dd82f0520f9e7db7311b42547ce6.zip | |
GFS2: Fix one RG corner case
For filesystems with only a single resource group, we need to be careful
that the allocation loop will not land up with a NULL resource group. This
fixes a bug in a previous patch where the gfs2_rgrpd_get_next() function
was being used instead of gfs2_rgrpd_get_first()
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/rgrp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 99a619788c65..5625e93bf61f 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -1776,10 +1776,11 @@ static u32 gfs2_orlov_skip(const struct gfs2_inode *ip) static bool gfs2_select_rgrp(struct gfs2_rgrpd **pos, const struct gfs2_rgrpd *begin) { struct gfs2_rgrpd *rgd = *pos; + struct gfs2_sbd *sdp = rgd->rd_sbd; rgd = gfs2_rgrpd_get_next(rgd); if (rgd == NULL) - rgd = gfs2_rgrpd_get_next(NULL); + rgd = gfs2_rgrpd_get_first(sdp); *pos = rgd; if (rgd != begin) /* If we didn't wrap */ return true; |