From: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Mon, 17 Oct 2011 23:47:17 +0000 (-0700)
Subject: ocfs2: send correct UUID to cleancache initialization
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e41d33af7c037a6f7350f8410b45ce83b50d1b80;p=linux-beck.git

ocfs2: send correct UUID to cleancache initialization

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>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
---

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 938e2b2b0c9c..4994f8b0e604 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -2360,7 +2360,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;