GFS2: Remove ancient, unused code

Remove code that used to have something to do with initrd
but has been unused for a long time.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c
index 8c0f16e301f6c8e1361073bbe5b021003ba06218..3cb0a44ba0237830d3874283eab33bcdc573be7d 100644 (file)
--- a/fs/gfs2/mount.c
+++ b/fs/gfs2/mount.c
@@ -85,14 +85,6 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount)
        int error = 0;
 
        if (!remount) {
-               /*  If someone preloaded options, use those instead  */
-               spin_lock(&gfs2_sys_margs_lock);
-               if (gfs2_sys_margs) {
-                       data = gfs2_sys_margs;
-                       gfs2_sys_margs = NULL;
-               }
-               spin_unlock(&gfs2_sys_margs_lock);
-
                /*  Set some defaults  */
                args->ar_quota = GFS2_QUOTA_DEFAULT;
                args->ar_data = GFS2_DATA_DEFAULT;

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 298bcb6c27137a5d746fc9109db404eb2b9a64d4..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",
@@ -477,8 +474,6 @@ static struct kset_uevent_ops gfs2_uevent_ops = {
 
 int gfs2_sys_init(void)
 {
-       gfs2_sys_margs = NULL;
-       spin_lock_init(&gfs2_sys_margs_lock);
        gfs2_kset = kset_create_and_add("gfs2", &gfs2_uevent_ops, fs_kobj);
        if (!gfs2_kset)
                return -ENOMEM;
@@ -487,7 +482,6 @@ int gfs2_sys_init(void)
 
 void gfs2_sys_uninit(void)
 {
-       kfree(gfs2_sys_margs);
        kset_unregister(gfs2_kset);
 }
 

diff --git a/fs/gfs2/sys.h b/fs/gfs2/sys.h
index 1ca8cdac5304bbf50682db1b9abf7ea5afd34e8d..e94560e836d79d008eb33100e00826952cea6efb 100644 (file)
--- a/fs/gfs2/sys.h
+++ b/fs/gfs2/sys.h
@@ -13,10 +13,6 @@
 #include <linux/spinlock.h>
 struct gfs2_sbd;
 
-/* Allow args to be passed to GFS2 when using an initial ram disk */
-extern char *gfs2_sys_margs;
-extern spinlock_t gfs2_sys_margs_lock;
-
 int gfs2_sys_fs_add(struct gfs2_sbd *sdp);
 void gfs2_sys_fs_del(struct gfs2_sbd *sdp);