diff --git a/[refs] b/[refs] index f3719dadebc0..8c51fb5a86df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7607ab3daeeaea50b3b5aebe8dfa29a1dfb8311 +refs/heads/master: a75a6e4c3ada10b15e26f6d12f72c03efde266e0 diff --git a/trunk/fs/ocfs2/super.c b/trunk/fs/ocfs2/super.c index 4e214ecb5886..3aa9f18527f0 100644 --- a/trunk/fs/ocfs2/super.c +++ b/trunk/fs/ocfs2/super.c @@ -1417,7 +1417,7 @@ static int ocfs2_initialize_super(struct super_block *sb, goto bail; } - memcpy(&uuid_net_key, &osb->uuid[i], sizeof(osb->net_key)); + memcpy(&uuid_net_key, osb->uuid, sizeof(uuid_net_key)); osb->net_key = le32_to_cpu(uuid_net_key); strncpy(osb->vol_label, di->id2.i_super.s_label, 63);