diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2015-10-28 09:05:31 -0500 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2015-11-09 09:38:02 -0600 |
| commit | 31dddd9eb9ebae9a2a9b502750e9e481d752180a (patch) | |
| tree | 50f32f0ae20f76801cfd4393dd0387a712ad1f22 /fs | |
| parent | c36b97e9430defab4b52ee370c18745343d92f6d (diff) | |
| download | linux-31dddd9eb9ebae9a2a9b502750e9e481d752180a.tar.gz linux-31dddd9eb9ebae9a2a9b502750e9e481d752180a.tar.bz2 linux-31dddd9eb9ebae9a2a9b502750e9e481d752180a.zip | |
GFS2: Fix rgrp end rounding problem for bsize < page size
This patch fixes a bug introduced by commit 7005c3e. That patch
tries to map a vm range for resource groups, but the calculation
breaks down when the block size is less than the page size.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/rgrp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index d29dd0cec914..c134c0462cee 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -933,8 +933,9 @@ static int read_rindex_entry(struct gfs2_inode *ip) goto fail; rgd->rd_gl->gl_object = rgd; - rgd->rd_gl->gl_vm.start = rgd->rd_addr * bsize; - rgd->rd_gl->gl_vm.end = rgd->rd_gl->gl_vm.start + (rgd->rd_length * bsize) - 1; + rgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_CACHE_MASK; + rgd->rd_gl->gl_vm.end = PAGE_CACHE_ALIGN((rgd->rd_addr + + rgd->rd_length) * bsize) - 1; rgd->rd_rgl = (struct gfs2_rgrp_lvb *)rgd->rd_gl->gl_lksb.sb_lvbptr; rgd->rd_flags &= ~(GFS2_RDF_UPTODATE | GFS2_RDF_PREFERRED); if (rgd->rd_data > sdp->sd_max_rg_data) |