Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e204703 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

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: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 2bfb6449

fs/gfs2/mount.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

fs/gfs2/sys.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

}

fs/gfs2/sys.h

+0 −4
Original line number Diff line number Diff line
@@ -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);