Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / fs / gfs2 / xattr.c

diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
index e9636591b5d554e6947d9508965e4f4bef1f1a7f..2e5ba425cae743f006b938a39b8e70469c9f471a 100644 (file)
--- a/fs/gfs2/xattr.c
+++ b/fs/gfs2/xattr.c
@@ -251,7 +251,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
        if (!blks)
                return 0;
 
-       rgd = gfs2_blk2rgrpd(sdp, bn);
+       rgd = gfs2_blk2rgrpd(sdp, bn, 1);
        if (!rgd) {
                gfs2_consist_inode(ip);
                return -EIO;
@@ -1439,7 +1439,7 @@ static int ea_dealloc_block(struct gfs2_inode *ip)
        struct gfs2_holder gh;
        int error;
 
-       rgd = gfs2_blk2rgrpd(sdp, ip->i_eattr);
+       rgd = gfs2_blk2rgrpd(sdp, ip->i_eattr, 1);
        if (!rgd) {
                gfs2_consist_inode(ip);
                return -EIO;