touchscreen: Fix build of da9034

[linux-2.6-omap-h63xx.git] / fs / gfs2 / sys.c

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 67ba5b7b759b450d845d68a392a9904d134d6db7..26c1fa777a959f66f33755b977fa54f61ee04cfe 100644 (file)
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -26,9 +26,6 @@
 #include "quota.h"
 #include "util.h"
 
-char *gfs2_sys_margs;
-spinlock_t gfs2_sys_margs_lock;
-
 static ssize_t id_show(struct gfs2_sbd *sdp, char *buf)
 {
        return snprintf(buf, PAGE_SIZE, "%u:%u\n",
@@ -461,11 +458,23 @@ void gfs2_sys_fs_del(struct gfs2_sbd *sdp)
        kobject_put(&sdp->sd_kobj);
 }
 
+static int gfs2_uevent(struct kset *kset, struct kobject *kobj,
+                      struct kobj_uevent_env *env)
+{
+       struct gfs2_sbd *sdp = container_of(kobj, struct gfs2_sbd, sd_kobj);
+       add_uevent_var(env, "LOCKTABLE=%s", sdp->sd_table_name);
+       add_uevent_var(env, "LOCKPROTO=%s", sdp->sd_proto_name);
+       return 0;
+}
+
+static struct kset_uevent_ops gfs2_uevent_ops = {
+       .uevent = gfs2_uevent,
+};
+
+
 int gfs2_sys_init(void)
 {
-       gfs2_sys_margs = NULL;
-       spin_lock_init(&gfs2_sys_margs_lock);
-       gfs2_kset = kset_create_and_add("gfs2", NULL, fs_kobj);
+       gfs2_kset = kset_create_and_add("gfs2", &gfs2_uevent_ops, fs_kobj);
        if (!gfs2_kset)
                return -ENOMEM;
        return 0;
@@ -473,7 +482,6 @@ int gfs2_sys_init(void)
 
 void gfs2_sys_uninit(void)
 {
-       kfree(gfs2_sys_margs);
        kset_unregister(gfs2_kset);
 }