Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / fs / gfs2 / bmap.c

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index e65493a..42e477f 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -854,11 +854,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh,
                        blen++;
                else {
                        if (bstart) {
-                               if (metadata)
-                                       __gfs2_free_meta(ip, bstart, blen);
-                               else
-                                       __gfs2_free_data(ip, bstart, blen);
-
+                               __gfs2_free_blocks(ip, bstart, blen, metadata);
                                btotal += blen;
                        }
 
@@ -870,11 +866,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh,
                gfs2_add_inode_blocks(&ip->i_inode, -1);
        }
        if (bstart) {
-               if (metadata)
-                       __gfs2_free_meta(ip, bstart, blen);
-               else
-                       __gfs2_free_data(ip, bstart, blen);
-
+               __gfs2_free_blocks(ip, bstart, blen, metadata);
                btotal += blen;
        }