From: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri, 21 Oct 2011 06:35:53 +0000 (-0700)
Subject: ocfs2: Fix cleancache initialization call to correctly pass uuid
X-Git-Tag: v2.6.39-400.9.0~855
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d49374712bfb6d50a8cc8606f428a34a8115215f;p=users%2Fjedix%2Flinux-maple.git

ocfs2: Fix cleancache initialization call to correctly pass uuid

As reported by Steven Whitehouse in https://lkml.org/lkml/2011/5/27/221
the ocfs2 volume UUID is incorrectly passed to cleancache.
As a result, shared-ephemeral tmem pools will not actually
be created; instead they will be private (unshared) which
misses out on a major benefit of tmem.

Reported-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
---

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index a1c0f41e432e..8b1924a1e386 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -2374,7 +2374,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
 		mlog_errno(status);
 		goto bail;
 	}
-	cleancache_init_shared_fs((char *)&uuid_net_key, sb);
+	cleancache_init_shared_fs((char *)&di->id2.i_super.s_uuid, sb);
 
 bail:
 	return status;