diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
| commit | 8e04221029067cbaff3fc8f4daf991532afbcbaf (patch) | |
| tree | 18cf757bcd315c76f5f458aa72a0a57db0a78985 /fs/gfs2/rgrp.c | |
| parent | 9ad62ec4f752c82b39aa5927f23d894b46ae10b9 (diff) | |
| parent | 2c940db250c1610d95ea5331dc819b8bd4db96ae (diff) | |
| download | kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.zip kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.gz kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.bz2 | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'fs/gfs2/rgrp.c')
| -rw-r--r-- | fs/gfs2/rgrp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 0608f49..503b842 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -591,11 +591,7 @@ static int gfs2_ri_update(struct gfs2_inode *ip) u64 rgrp_count = ip->i_disksize; int error; - if (do_div(rgrp_count, sizeof(struct gfs2_rindex))) { - gfs2_consist_inode(ip); - return -EIO; - } - + do_div(rgrp_count, sizeof(struct gfs2_rindex)); clear_rgrpdi(sdp); file_ra_state_init(&ra_state, inode->i_mapping); @@ -915,7 +911,7 @@ void gfs2_rgrp_repolish_clones(struct gfs2_rgrpd *rgd) struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip) { BUG_ON(ip->i_alloc != NULL); - ip->i_alloc = kzalloc(sizeof(struct gfs2_alloc), GFP_KERNEL); + ip->i_alloc = kzalloc(sizeof(struct gfs2_alloc), GFP_NOFS); return ip->i_alloc; } |