From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Thu, 4 May 2006 18:49:22 +0000 (-0700)
Subject: ocfs2: fix init of uuid_net_key
X-Git-Tag: v2.6.18-rc1~320^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a75a6e4c3ada10b15e26f6d12f72c03efde266e0;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 4e214ecb588..3aa9f18527f 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);