Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 95bb33e41a7607bf4885aaa1e4423107c35645f6..51883b3ad89cd3359d5e489b7befec257650df60 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -234,6 +234,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);
 }
 
 /**
@@ -295,15 +296,15 @@ static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector)
        __free_page(page);
        return 0;
 }
+
 /**
  * gfs2_read_sb - Read super block
  * @sdp: The GFS2 superblock
- * @gl: the glock for the superblock (assumed to be held)
  * @silent: Don't print message if mount fails
  *
  */
 
-static int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent)
+static int gfs2_read_sb(struct gfs2_sbd *sdp, int silent)
 {
        u32 hash_blocks, ind_blocks, leaf_blocks;
        u32 tmp_blocks;
@@ -523,7 +524,7 @@ static int init_sb(struct gfs2_sbd *sdp, int silent)
                return ret;
        }
 
-       ret = gfs2_read_sb(sdp, sb_gh.gh_gl, silent);
+       ret = gfs2_read_sb(sdp, silent);
        if (ret) {
                fs_err(sdp, "can't read superblock: %d\n", ret);
                goto out;
@@ -1258,6 +1259,8 @@ fail_sb:
                dput(sdp->sd_root_dir);
        if (sdp->sd_master_dir)
                dput(sdp->sd_master_dir);
+       if (sb->s_root)
+               dput(sb->s_root);
        sb->s_root = NULL;
 fail_locking:
        init_locking(sdp, &mount_gh, UNDO);