Commit 2b88f7c5 authored by Steven Whitehouse's avatar Steven Whitehouse

GFS2: Remove unused sysfs file

The /sys/fs/gfs2/<fsname>/lock_module/id file has been unused for
some time now, so we can remove it. We still accept the mount option
though, as userspace still sends that.
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent acf7e244
...@@ -496,7 +496,6 @@ struct gfs2_sb_host { ...@@ -496,7 +496,6 @@ struct gfs2_sb_host {
*/ */
struct lm_lockstruct { struct lm_lockstruct {
u32 ls_id;
unsigned int ls_jid; unsigned int ls_jid;
unsigned int ls_first; unsigned int ls_first;
unsigned int ls_first_done; unsigned int ls_first_done;
......
...@@ -1028,7 +1028,6 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) ...@@ -1028,7 +1028,6 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
ls->ls_ops = lm; ls->ls_ops = lm;
ls->ls_first = 1; ls->ls_first = 1;
ls->ls_id = 0;
for (options = args->ar_hostdata; (o = strsep(&options, ":")); ) { for (options = args->ar_hostdata; (o = strsep(&options, ":")); ) {
substring_t tmp[MAX_OPT_ARGS]; substring_t tmp[MAX_OPT_ARGS];
...@@ -1046,10 +1045,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) ...@@ -1046,10 +1045,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
ls->ls_jid = option; ls->ls_jid = option;
break; break;
case Opt_id: case Opt_id:
ret = match_int(&tmp[0], &option); /* Obsolete, but left for backward compat purposes */
if (ret)
goto hostdata_error;
ls->ls_id = option;
break; break;
case Opt_first: case Opt_first:
ret = match_int(&tmp[0], &option); ret = match_int(&tmp[0], &option);
......
...@@ -320,12 +320,6 @@ static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len) ...@@ -320,12 +320,6 @@ static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
return ret; return ret;
} }
static ssize_t lkid_show(struct gfs2_sbd *sdp, char *buf)
{
struct lm_lockstruct *ls = &sdp->sd_lockstruct;
return sprintf(buf, "%u\n", ls->ls_id);
}
static ssize_t lkfirst_show(struct gfs2_sbd *sdp, char *buf) static ssize_t lkfirst_show(struct gfs2_sbd *sdp, char *buf)
{ {
struct lm_lockstruct *ls = &sdp->sd_lockstruct; struct lm_lockstruct *ls = &sdp->sd_lockstruct;
...@@ -390,7 +384,6 @@ static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store) ...@@ -390,7 +384,6 @@ static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store)
GDLM_ATTR(proto_name, 0444, proto_name_show, NULL); GDLM_ATTR(proto_name, 0444, proto_name_show, NULL);
GDLM_ATTR(block, 0644, block_show, block_store); GDLM_ATTR(block, 0644, block_show, block_store);
GDLM_ATTR(withdraw, 0644, withdraw_show, withdraw_store); GDLM_ATTR(withdraw, 0644, withdraw_show, withdraw_store);
GDLM_ATTR(id, 0444, lkid_show, NULL);
GDLM_ATTR(jid, 0444, jid_show, NULL); GDLM_ATTR(jid, 0444, jid_show, NULL);
GDLM_ATTR(first, 0444, lkfirst_show, NULL); GDLM_ATTR(first, 0444, lkfirst_show, NULL);
GDLM_ATTR(first_done, 0444, first_done_show, NULL); GDLM_ATTR(first_done, 0444, first_done_show, NULL);
...@@ -402,7 +395,6 @@ static struct attribute *lock_module_attrs[] = { ...@@ -402,7 +395,6 @@ static struct attribute *lock_module_attrs[] = {
&gdlm_attr_proto_name.attr, &gdlm_attr_proto_name.attr,
&gdlm_attr_block.attr, &gdlm_attr_block.attr,
&gdlm_attr_withdraw.attr, &gdlm_attr_withdraw.attr,
&gdlm_attr_id.attr,
&gdlm_attr_jid.attr, &gdlm_attr_jid.attr,
&gdlm_attr_first.attr, &gdlm_attr_first.attr,
&gdlm_attr_first_done.attr, &gdlm_attr_first_done.attr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment