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

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

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index d3c69eb..2a77071 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -72,6 +72,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
 
        init_waitqueue_head(&sdp->sd_glock_wait);
        atomic_set(&sdp->sd_glock_disposal, 0);
+       init_completion(&sdp->sd_locking_init);
        spin_lock_init(&sdp->sd_statfs_spin);
 
        spin_lock_init(&sdp->sd_rindex_spin);
@@ -126,8 +127,10 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
  * changed.
  */
 
-static int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb_host *sb, int silent)
+static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)
 {
+       struct gfs2_sb_host *sb = &sdp->sd_sb;
+
        if (sb->sb_magic != GFS2_MAGIC ||
            sb->sb_type != GFS2_METATYPE_SB) {
                if (!silent)
@@ -157,8 +160,10 @@ static void end_bio_io_page(struct bio *bio, int error)
        unlock_page(page);
 }
 
-static void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf)
+static void gfs2_sb_in(struct gfs2_sbd *sdp, const void *buf)
 {
+       struct gfs2_sb_host *sb = &sdp->sd_sb;
+       struct super_block *s = sdp->sd_vfs;
        const struct gfs2_sb *str = buf;
 
        sb->sb_magic = be32_to_cpu(str->sb_header.mh_magic);
@@ -175,7 +180,7 @@ static void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf)
 
        memcpy(sb->sb_lockproto, str->sb_lockproto, GFS2_LOCKNAME_LEN);
        memcpy(sb->sb_locktable, str->sb_locktable, GFS2_LOCKNAME_LEN);
-       memcpy(sb->sb_uuid, str->sb_uuid, 16);
+       memcpy(s->s_uuid, str->sb_uuid, 16);
 }
 
 /**
@@ -197,7 +202,7 @@ static void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf)
  * Returns: 0 on success or error
  */
 
-static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector)
+static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector, int silent)
 {
        struct super_block *sb = sdp->sd_vfs;
        struct gfs2_sb *p;
@@ -227,10 +232,10 @@ static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector)
                return -EIO;
        }
        p = kmap(page);
-       gfs2_sb_in(&sdp->sd_sb, p);
+       gfs2_sb_in(sdp, p);
        kunmap(page);
        __free_page(page);
-       return 0;
+       return gfs2_check_sb(sdp, silent);
 }
 
 /**
@@ -247,17 +252,13 @@ static int gfs2_read_sb(struct gfs2_sbd *sdp, int silent)
        unsigned int x;
        int error;
 
-       error = gfs2_read_super(sdp, GFS2_SB_ADDR >> sdp->sd_fsb2bb_shift);
+       error = gfs2_read_super(sdp, GFS2_SB_ADDR >> sdp->sd_fsb2bb_shift, silent);
        if (error) {
                if (!silent)
                        fs_err(sdp, "can't read superblock\n");
                return error;
        }
 
-       error = gfs2_check_sb(sdp, &sdp->sd_sb, silent);
-       if (error)
-               return error;
-
        sdp->sd_fsb2bb_shift = sdp->sd_sb.sb_bsize_shift -
                               GFS2_BASIC_BLOCK_SHIFT;
        sdp->sd_fsb2bb = 1 << sdp->sd_fsb2bb_shift;
@@ -340,14 +341,10 @@ static int init_names(struct gfs2_sbd *sdp, int silent)
        /*  Try to autodetect  */
 
        if (!proto[0] || !table[0]) {
-               error = gfs2_read_super(sdp, GFS2_SB_ADDR >> sdp->sd_fsb2bb_shift);
+               error = gfs2_read_super(sdp, GFS2_SB_ADDR >> sdp->sd_fsb2bb_shift, silent);
                if (error)
                        return error;
 
-               error = gfs2_check_sb(sdp, &sdp->sd_sb, silent);
-               if (error)
-                       goto out;
-
                if (!proto[0])
                        proto = sdp->sd_sb.sb_lockproto;
                if (!table[0])
@@ -364,7 +361,6 @@ static int init_names(struct gfs2_sbd *sdp, int silent)
        while ((table = strchr(table, '/')))
                *table = '_';
 
-out:
        return error;
 }
 
@@ -1022,11 +1018,13 @@ hostdata_error:
                fsname++;
        if (lm->lm_mount == NULL) {
                fs_info(sdp, "Now mounting FS...\n");
+               complete(&sdp->sd_locking_init);
                return 0;
        }
        ret = lm->lm_mount(sdp, fsname);
        if (ret == 0)
                fs_info(sdp, "Joined cluster. Now mounting FS...\n");
+       complete(&sdp->sd_locking_init);
        return ret;
 }
 
@@ -1119,8 +1117,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent
        if (sdp->sd_args.ar_statfs_quantum) {
                sdp->sd_tune.gt_statfs_slow = 0;
                sdp->sd_tune.gt_statfs_quantum = sdp->sd_args.ar_statfs_quantum;
-       }
-       else {
+       } else {
                sdp->sd_tune.gt_statfs_slow = 1;
                sdp->sd_tune.gt_statfs_quantum = 30;
        }