aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2009-09-09 10:59:35 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2009-09-09 10:59:35 -0400
commit2b88f7c535a8125213def012a67c1b0a667ceb2e (patch)
tree9351a2c0a444c5054bf9b4744f37b3ac30a2ab32
parentacf7e2444acfaf4c8540603b76d71010eea3fc24 (diff)
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: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/incore.h1
-rw-r--r--fs/gfs2/ops_fstype.c6
-rw-r--r--fs/gfs2/sys.c8
3 files changed, 1 insertions, 14 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 52436abc3b4d..6edb423f90b3 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -496,7 +496,6 @@ struct gfs2_sb_host {
496 */ 496 */
497 497
498struct lm_lockstruct { 498struct lm_lockstruct {
499 u32 ls_id;
500 unsigned int ls_jid; 499 unsigned int ls_jid;
501 unsigned int ls_first; 500 unsigned int ls_first;
502 unsigned int ls_first_done; 501 unsigned int ls_first_done;
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 8e3f00e1430d..52fb6c048981 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1028,7 +1028,6 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
1028 1028
1029 ls->ls_ops = lm; 1029 ls->ls_ops = lm;
1030 ls->ls_first = 1; 1030 ls->ls_first = 1;
1031 ls->ls_id = 0;
1032 1031
1033 for (options = args->ar_hostdata; (o = strsep(&options, ":")); ) { 1032 for (options = args->ar_hostdata; (o = strsep(&options, ":")); ) {
1034 substring_t tmp[MAX_OPT_ARGS]; 1033 substring_t tmp[MAX_OPT_ARGS];
@@ -1046,10 +1045,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
1046 ls->ls_jid = option; 1045 ls->ls_jid = option;
1047 break; 1046 break;
1048 case Opt_id: 1047 case Opt_id:
1049 ret = match_int(&tmp[0], &option); 1048 /* Obsolete, but left for backward compat purposes */
1050 if (ret)
1051 goto hostdata_error;
1052 ls->ls_id = option;
1053 break; 1049 break;
1054 case Opt_first: 1050 case Opt_first:
1055 ret = match_int(&tmp[0], &option); 1051 ret = match_int(&tmp[0], &option);
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 0d4f7e974e9f..446329728d52 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -320,12 +320,6 @@ static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
320 return ret; 320 return ret;
321} 321}
322 322
323static ssize_t lkid_show(struct gfs2_sbd *sdp, char *buf)
324{
325 struct lm_lockstruct *ls = &sdp->sd_lockstruct;
326 return sprintf(buf, "%u\n", ls->ls_id);
327}
328
329static ssize_t lkfirst_show(struct gfs2_sbd *sdp, char *buf) 323static ssize_t lkfirst_show(struct gfs2_sbd *sdp, char *buf)
330{ 324{
331 struct lm_lockstruct *ls = &sdp->sd_lockstruct; 325 struct lm_lockstruct *ls = &sdp->sd_lockstruct;
@@ -390,7 +384,6 @@ static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store)
390GDLM_ATTR(proto_name, 0444, proto_name_show, NULL); 384GDLM_ATTR(proto_name, 0444, proto_name_show, NULL);
391GDLM_ATTR(block, 0644, block_show, block_store); 385GDLM_ATTR(block, 0644, block_show, block_store);
392GDLM_ATTR(withdraw, 0644, withdraw_show, withdraw_store); 386GDLM_ATTR(withdraw, 0644, withdraw_show, withdraw_store);
393GDLM_ATTR(id, 0444, lkid_show, NULL);
394GDLM_ATTR(jid, 0444, jid_show, NULL); 387GDLM_ATTR(jid, 0444, jid_show, NULL);
395GDLM_ATTR(first, 0444, lkfirst_show, NULL); 388GDLM_ATTR(first, 0444, lkfirst_show, NULL);
396GDLM_ATTR(first_done, 0444, first_done_show, NULL); 389GDLM_ATTR(first_done, 0444, first_done_show, NULL);
@@ -402,7 +395,6 @@ static struct attribute *lock_module_attrs[] = {
402 &gdlm_attr_proto_name.attr, 395 &gdlm_attr_proto_name.attr,
403 &gdlm_attr_block.attr, 396 &gdlm_attr_block.attr,
404 &gdlm_attr_withdraw.attr, 397 &gdlm_attr_withdraw.attr,
405 &gdlm_attr_id.attr,
406 &gdlm_attr_jid.attr, 398 &gdlm_attr_jid.attr,
407 &gdlm_attr_first.attr, 399 &gdlm_attr_first.attr,
408 &gdlm_attr_first_done.attr, 400 &gdlm_attr_first_done.attr,