summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2006-05-04 11:49:22 -0700
committerMark Fasheh <mark.fasheh@oracle.com>2006-06-29 16:06:43 -0700
commita75a6e4c3ada10b15e26f6d12f72c03efde266e0 (patch)
tree408ffc1590df90c04e98cae96affe426b6521d31
parente7607ab3daeeaea50b3b5aebe8dfa29a1dfb8311 (diff)
downloadlinux-stable-a75a6e4c3ada10b15e26f6d12f72c03efde266e0.tar.gz
linux-stable-a75a6e4c3ada10b15e26f6d12f72c03efde266e0.tar.bz2
linux-stable-a75a6e4c3ada10b15e26f6d12f72c03efde266e0.zip
ocfs2: fix init of uuid_net_key
ocfs2_initialize_super() should be copying from the beginning of the uuid. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
-rw-r--r--fs/ocfs2/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 4e214ecb5886..3aa9f18527f0 100644
--- a/fs/ocfs2/super.c
+++ b/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);