X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Flproc_ofd.c;h=65b57f3be6f08b112dcef7129499f57ab0e2d571;hb=b32e55b600ca2c9bf8b62287d9f889791d157426;hp=c6b7d26a342e2d4d1f972121afa7b40c8791e481;hpb=7817e4c785d075aae76b635dcf799064590833b0;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/lproc_ofd.c b/lustre/ofd/lproc_ofd.c
index c6b7d26..65b57f3 100644
--- a/lustre/ofd/lproc_ofd.c
+++ b/lustre/ofd/lproc_ofd.c
@@ -414,78 +414,6 @@ ofd_fmd_max_age_seq_write(struct file *file, const char __user *buffer,
 LPROC_SEQ_FOPS(ofd_fmd_max_age);
 
 /**
- * Show if OSS FID capability is enabled or disabled
- *
- * \param[in] m		seq_file handle
- * \param[in] data	unused for single entry
- *
- * \retval		0 on success
- * \retval		negative value on error
- */
-static int ofd_capa_seq_show(struct seq_file *m, void *data)
-{
-	struct obd_device	*obd = m->private;
-
-	return seq_printf(m, "capability on: %s\n",
-			  obd->u.filter.fo_fl_oss_capa ? "oss" : "");
-}
-
-/**
- * Enable or disable OSS FID capability mode.
- *
- * \param[in] file	proc file
- * \param[in] buffer	string which represents mode
- *			1: enable mode
- *			0: disable mode
- * \param[in] count	\a buffer length
- * \param[in] off	unused for single entry
- *
- * \retval		\a count on success
- * \retval		negative number on error
- */
-static ssize_t
-ofd_capa_seq_write(struct file *file, const char *__user buffer, size_t count,
-		   loff_t *off)
-{
-	struct seq_file		*m = file->private_data;
-	struct obd_device	*obd = m->private;
-	int			 val, rc;
-
-	rc = lprocfs_write_helper(buffer, count, &val);
-	if (rc)
-		return rc;
-
-	if (val & ~0x1) {
-		CERROR("invalid capability mode, only 0/1 are accepted.\n"
-		       " 1: enable oss fid capability\n"
-		       " 0: disable oss fid capability\n");
-		return -EINVAL;
-	}
-
-	obd->u.filter.fo_fl_oss_capa = val;
-	LCONSOLE_INFO("OSS %s %s fid capability.\n", obd->obd_name,
-		      val ? "enabled" : "disabled");
-	return count;
-}
-LPROC_SEQ_FOPS(ofd_capa);
-
-/**
- * Show capability count on client and server side.
- *
- * \param[in] m		seq_file handle
- * \param[in] data	unused for single entry
- *
- * \retval		0 on success
- * \retval		negative value on error
- */
-static int ofd_capa_count_seq_show(struct seq_file *m, void *data)
-{
-	return seq_printf(m, "%d %d\n", capa_count[CAPA_SITE_CLIENT],
-			  capa_count[CAPA_SITE_SERVER]);
-}
-LPROC_SEQ_FOPS_RO(ofd_capa_count);
-
-/**
  * Show if the OFD is in degraded mode.
  *
  * Degraded means OFD has a failed drive or is undergoing RAID rebuild.
@@ -983,7 +911,7 @@ LPROC_SEQ_FOPS_RO_TYPE(ofd, target_instance);
 LPROC_SEQ_FOPS_RW_TYPE(ofd, ir_factor);
 LPROC_SEQ_FOPS_RW_TYPE(ofd, job_interval);
 
-struct lprocfs_seq_vars lprocfs_ofd_obd_vars[] = {
+struct lprocfs_vars lprocfs_ofd_obd_vars[] = {
 	{ .name =	"uuid",
 	  .fops =	&ofd_uuid_fops			},
 	{ .name =	"blocksize",
@@ -1042,10 +970,6 @@ struct lprocfs_seq_vars lprocfs_ofd_obd_vars[] = {
 	  .fops =	&ofd_fmd_max_num_fops		},
 	{ .name =	"client_cache_seconds",
 	  .fops =	&ofd_fmd_max_age_fops		},
-	{ .name =	"capa",
-	  .fops =	&ofd_capa_fops			},
-	{ .name =	"capa_count",
-	  .fops =	&ofd_capa_count_fops		},
 	{ .name =	"job_cleanup_interval",
 	  .fops =	&ofd_job_interval_fops		},
 	{ .name =	"soft_sync_limit",