gfs2: eliminate gfs2_rsqa_alloc in favor of gfs2_qa_alloc

[linux-2.6-microblaze.git] / fs / gfs2 / bmap.c

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 08f6fbb..4b9dbab 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -2183,7 +2183,7 @@ int gfs2_setattr_size(struct inode *inode, u64 newsize)
 
        inode_dio_wait(inode);
 
-       ret = gfs2_rsqa_alloc(ip);
+       ret = gfs2_qa_alloc(ip);
        if (ret)
                goto out;
 
@@ -2223,7 +2223,7 @@ void gfs2_free_journal_extents(struct gfs2_jdesc *jd)
        struct gfs2_journal_extent *jext;
 
        while(!list_empty(&jd->extent_list)) {
-               jext = list_entry(jd->extent_list.next, struct gfs2_journal_extent, list);
+               jext = list_first_entry(&jd->extent_list, struct gfs2_journal_extent, list);
                list_del(&jext->list);
                kfree(jext);
        }
@@ -2244,7 +2244,7 @@ static int gfs2_add_jextent(struct gfs2_jdesc *jd, u64 lblock, u64 dblock, u64 b
        struct gfs2_journal_extent *jext;
 
        if (!list_empty(&jd->extent_list)) {
-               jext = list_entry(jd->extent_list.prev, struct gfs2_journal_extent, list);
+               jext = list_last_entry(&jd->extent_list, struct gfs2_journal_extent, list);
                if ((jext->dblock + jext->blocks) == dblock) {
                        jext->blocks += blocks;
                        return 0;