Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[mv-sheeva.git] / fs / gfs2 / trans.h

diff --git a/fs/gfs2/trans.h b/fs/gfs2/trans.h
index f8f101ef600cd04b970a1a55be2dfbff7c3cd8ef..125d4572e1c026dbe31b496ae7aa79f4af8f7b56 100644 (file)
--- a/fs/gfs2/trans.h
+++ b/fs/gfs2/trans.h
@@ -30,9 +30,9 @@ struct gfs2_glock;
  * block, or all of the blocks in the rg, whichever is smaller */
 static inline unsigned int gfs2_rg_blocks(const struct gfs2_inode *ip)
 {
-       const struct gfs2_alloc *al = ip->i_alloc;
-       if (al->al_requested < ip->i_rgd->rd_length)
-               return al->al_requested + 1;
+       const struct gfs2_blkreserv *rs = ip->i_res;
+       if (rs->rs_requested < ip->i_rgd->rd_length)
+               return rs->rs_requested + 1;
        return ip->i_rgd->rd_length;
 }