Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[karo-tx-linux.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 079587e5384901321ff8a16cc9a5a641fe3889ba..7e823bbd24536d9acfc27037c5d0f2268e47d322 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -77,8 +77,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
 
        spin_lock_init(&sdp->sd_rindex_spin);
        mutex_init(&sdp->sd_rindex_mutex);
-       INIT_LIST_HEAD(&sdp->sd_rindex_list);
-       INIT_LIST_HEAD(&sdp->sd_rindex_mru_list);
+       sdp->sd_rindex_tree.rb_node = NULL;
 
        INIT_LIST_HEAD(&sdp->sd_jindex_list);
        spin_lock_init(&sdp->sd_jindex_spin);
@@ -652,7 +651,6 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)
                fs_err(sdp, "can't lookup journal index: %d\n", error);
                return PTR_ERR(sdp->sd_jindex);
        }
-       ip = GFS2_I(sdp->sd_jindex);
 
        /* Load in the journal index special file */
 
@@ -764,7 +762,6 @@ fail:
 static int init_inodes(struct gfs2_sbd *sdp, int undo)
 {
        int error = 0;
-       struct gfs2_inode *ip;
        struct inode *master = sdp->sd_master_dir->d_inode;
 
        if (undo)
@@ -789,7 +786,6 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo)
                fs_err(sdp, "can't get resource index inode: %d\n", error);
                goto fail_statfs;
        }
-       ip = GFS2_I(sdp->sd_rindex);
        sdp->sd_rindex_uptodate = 0;
 
        /* Read in the quota inode */