diff options
Diffstat (limited to 'fs/gfs2/sys.c')
-rw-r--r-- | fs/gfs2/sys.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index 54fd98425991..37f5393e68e6 100644 --- a/fs/gfs2/sys.c +++ b/fs/gfs2/sys.c | |||
@@ -232,6 +232,8 @@ static ssize_t demote_rq_store(struct gfs2_sbd *sdp, const char *buf, size_t len | |||
232 | glops = gfs2_glops_list[gltype]; | 232 | glops = gfs2_glops_list[gltype]; |
233 | if (glops == NULL) | 233 | if (glops == NULL) |
234 | return -EINVAL; | 234 | return -EINVAL; |
235 | if (!test_and_set_bit(SDF_DEMOTE, &sdp->sd_flags)) | ||
236 | fs_info(sdp, "demote interface used\n"); | ||
235 | rv = gfs2_glock_get(sdp, glnum, glops, 0, &gl); | 237 | rv = gfs2_glock_get(sdp, glnum, glops, 0, &gl); |
236 | if (rv) | 238 | if (rv) |
237 | return rv; | 239 | return rv; |
@@ -468,8 +470,6 @@ static ssize_t name##_store(struct gfs2_sbd *sdp, const char *buf, size_t len)\ | |||
468 | } \ | 470 | } \ |
469 | TUNE_ATTR_2(name, name##_store) | 471 | TUNE_ATTR_2(name, name##_store) |
470 | 472 | ||
471 | TUNE_ATTR(incore_log_blocks, 0); | ||
472 | TUNE_ATTR(log_flush_secs, 0); | ||
473 | TUNE_ATTR(quota_warn_period, 0); | 473 | TUNE_ATTR(quota_warn_period, 0); |
474 | TUNE_ATTR(quota_quantum, 0); | 474 | TUNE_ATTR(quota_quantum, 0); |
475 | TUNE_ATTR(max_readahead, 0); | 475 | TUNE_ATTR(max_readahead, 0); |
@@ -481,8 +481,6 @@ TUNE_ATTR(statfs_quantum, 1); | |||
481 | TUNE_ATTR_3(quota_scale, quota_scale_show, quota_scale_store); | 481 | TUNE_ATTR_3(quota_scale, quota_scale_show, quota_scale_store); |
482 | 482 | ||
483 | static struct attribute *tune_attrs[] = { | 483 | static struct attribute *tune_attrs[] = { |
484 | &tune_attr_incore_log_blocks.attr, | ||
485 | &tune_attr_log_flush_secs.attr, | ||
486 | &tune_attr_quota_warn_period.attr, | 484 | &tune_attr_quota_warn_period.attr, |
487 | &tune_attr_quota_quantum.attr, | 485 | &tune_attr_quota_quantum.attr, |
488 | &tune_attr_max_readahead.attr, | 486 | &tune_attr_max_readahead.attr, |