mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2025-02-11 20:47:14 +00:00
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>
This commit is contained in:
parent
2bfb6449b7
commit
2e204703a1
@ -85,14 +85,6 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount)
|
|||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
if (!remount) {
|
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 */
|
/* Set some defaults */
|
||||||
args->ar_quota = GFS2_QUOTA_DEFAULT;
|
args->ar_quota = GFS2_QUOTA_DEFAULT;
|
||||||
args->ar_data = GFS2_DATA_DEFAULT;
|
args->ar_data = GFS2_DATA_DEFAULT;
|
||||||
|
@ -26,9 +26,6 @@
|
|||||||
#include "quota.h"
|
#include "quota.h"
|
||||||
#include "util.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)
|
static ssize_t id_show(struct gfs2_sbd *sdp, char *buf)
|
||||||
{
|
{
|
||||||
return snprintf(buf, PAGE_SIZE, "%u:%u\n",
|
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)
|
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);
|
gfs2_kset = kset_create_and_add("gfs2", &gfs2_uevent_ops, fs_kobj);
|
||||||
if (!gfs2_kset)
|
if (!gfs2_kset)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
@ -487,7 +482,6 @@ int gfs2_sys_init(void)
|
|||||||
|
|
||||||
void gfs2_sys_uninit(void)
|
void gfs2_sys_uninit(void)
|
||||||
{
|
{
|
||||||
kfree(gfs2_sys_margs);
|
|
||||||
kset_unregister(gfs2_kset);
|
kset_unregister(gfs2_kset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,10 +13,6 @@
|
|||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
struct gfs2_sbd;
|
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);
|
int gfs2_sys_fs_add(struct gfs2_sbd *sdp);
|
||||||
void gfs2_sys_fs_del(struct gfs2_sbd *sdp);
|
void gfs2_sys_fs_del(struct gfs2_sbd *sdp);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user