From 2e136b9092473144ecabea0f206667b3923a818e Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 17 Feb 2010 09:41:34 +0000
Subject: [PATCH] --- yaml --- r: 181831 b: refs/heads/master c:
 b4a5d4bc377e49239374f266f0a0e2772c29749c h: refs/heads/master i:   181829:
 5d0df5a2de32b3db9d95ef42f9b7857b39b23549   181827:
 ce7f85fad12f477161be008e789cae98addaef06   181823:
 ae78cfaa87f0f816010e3fbf6bb3b915f7f79df8 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/dlm/lockspace.c | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f957d382631f..d50c0058182b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf6620acc0f6fac57968aafef79ab372bdcf6157
+refs/heads/master: b4a5d4bc377e49239374f266f0a0e2772c29749c
diff --git a/trunk/fs/dlm/lockspace.c b/trunk/fs/dlm/lockspace.c
index c010ecfc0d29..26a8bd40400a 100644
--- a/trunk/fs/dlm/lockspace.c
+++ b/trunk/fs/dlm/lockspace.c
@@ -191,6 +191,18 @@ static int do_uevent(struct dlm_ls *ls, int in)
 	return error;
 }
 
+static int dlm_uevent(struct kset *kset, struct kobject *kobj,
+		      struct kobj_uevent_env *env)
+{
+	struct dlm_ls *ls = container_of(kobj, struct dlm_ls, ls_kobj);
+
+	add_uevent_var(env, "LOCKSPACE=%s", ls->ls_name);
+	return 0;
+}
+
+static struct kset_uevent_ops dlm_uevent_ops = {
+	.uevent = dlm_uevent,
+};
 
 int __init dlm_lockspace_init(void)
 {
@@ -199,7 +211,7 @@ int __init dlm_lockspace_init(void)
 	INIT_LIST_HEAD(&lslist);
 	spin_lock_init(&lslist_lock);
 
-	dlm_kset = kset_create_and_add("dlm", NULL, kernel_kobj);
+	dlm_kset = kset_create_and_add("dlm", &dlm_uevent_ops, kernel_kobj);
 	if (!dlm_kset) {
 		printk(KERN_WARNING "%s: can not create kset\n", __func__);
 		return -ENOMEM;