* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2013, 2014 Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include "osp_internal.h"
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
/**
* Show OSP active status
*
LPROC_SEQ_FOPS_RW_TYPE(osp, import);
LPROC_SEQ_FOPS_RO_TYPE(osp, state);
-static struct lprocfs_seq_vars lprocfs_osp_obd_vars[] = {
+/**
+ * Show high watermark (in megabytes). If available free space at OST is grater
+ * than high watermark and object allocation for OST is disabled, enable it.
+ *
+ * \param[in] m seq_file handle
+ * \param[in] data unused for single entry
+ * \retval 0 on success
+ * \retval negative number on error
+ */
+static int osp_reserved_mb_high_seq_show(struct seq_file *m, void *data)
+{
+ struct obd_device *dev = m->private;
+ struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev);
+
+ if (osp == NULL)
+ return -EINVAL;
+
+ return seq_printf(m, "%u\n", osp->opd_reserved_mb_high);
+}
+
+/**
+ * Change high watermark
+ *
+ * \param[in] file proc file
+ * \param[in] buffer string which represents new value (in megabytes)
+ * \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
+osp_reserved_mb_high_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
+{
+ struct seq_file *m = file->private_data;
+ struct obd_device *dev = m->private;
+ struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev);
+ __u64 val;
+ int rc;
+
+ if (osp == NULL)
+ return -EINVAL;
+
+ rc = lprocfs_write_frac_u64_helper(buffer, count, &val, 1 << 20);
+ if (rc)
+ return rc;
+ val >>= 20;
+ if (val < 1)
+ return -ERANGE;
+
+ spin_lock(&osp->opd_pre_lock);
+ osp->opd_reserved_mb_high = val;
+ if (val <= osp->opd_reserved_mb_low)
+ osp->opd_reserved_mb_low = val - 1;
+ spin_unlock(&osp->opd_pre_lock);
+
+ return count;
+}
+LPROC_SEQ_FOPS(osp_reserved_mb_high);
+
+/**
+ * Show low watermark (in megabytes). If available free space at OST is less
+ * than low watermark, object allocation for OST is disabled.
+ *
+ * \param[in] m seq_file handle
+ * \param[in] data unused for single entry
+ * \retval 0 on success
+ * \retval negative number on error
+ */
+static int osp_reserved_mb_low_seq_show(struct seq_file *m, void *data)
+{
+ struct obd_device *dev = m->private;
+ struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev);
+
+ if (osp == NULL)
+ return -EINVAL;
+
+ return seq_printf(m, "%u\n", osp->opd_reserved_mb_low);
+}
+
+/**
+ * Change low watermark
+ *
+ * \param[in] file proc file
+ * \param[in] buffer string which represents new value (in megabytes)
+ * \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
+osp_reserved_mb_low_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
+{
+ struct seq_file *m = file->private_data;
+ struct obd_device *dev = m->private;
+ struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev);
+ __u64 val;
+ int rc;
+
+ if (osp == NULL)
+ return -EINVAL;
+
+ rc = lprocfs_write_frac_u64_helper(buffer, count, &val, 1 << 20);
+ if (rc)
+ return rc;
+ val >>= 20;
+
+ spin_lock(&osp->opd_pre_lock);
+ osp->opd_reserved_mb_low = val;
+ if (val >= osp->opd_reserved_mb_high)
+ osp->opd_reserved_mb_high = val + 1;
+ spin_unlock(&osp->opd_pre_lock);
+
+ return count;
+}
+LPROC_SEQ_FOPS(osp_reserved_mb_low);
+
+static struct lprocfs_vars lprocfs_osp_obd_vars[] = {
{ .name = "uuid",
.fops = &osp_uuid_fops },
{ .name = "ping",
.fops = &osp_syn_in_prog_fops },
{ .name = "old_sync_processed",
.fops = &osp_old_sync_processed_fops },
+ { .name = "reserved_mb_high",
+ .fops = &osp_reserved_mb_high_fops },
+ { .name = "reserved_mb_low",
+ .fops = &osp_reserved_mb_low_fops },
/* for compatibility reasons */
{ .name = "destroys_in_flight",
.fops = &osp_destroys_in_flight_fops },
{ .name = "lfsck_max_rpcs_in_flight",
.fops = &osp_lfsck_max_rpcs_in_flight_fops },
- { 0 }
+ { NULL }
+};
+
+static struct lprocfs_vars lprocfs_osp_md_vars[] = {
+ { .name = "uuid",
+ .fops = &osp_uuid_fops },
+ { .name = "ping",
+ .fops = &osp_ping_fops,
+ .proc_mode = 0222 },
+ { .name = "connect_flags",
+ .fops = &osp_connect_flags_fops },
+ { .name = "mdt_server_uuid",
+ .fops = &osp_server_uuid_fops },
+ { .name = "mdt_conn_uuid",
+ .fops = &osp_conn_uuid_fops },
+ { .name = "active",
+ .fops = &osp_active_fops },
+ { .name = "max_rpcs_in_flight",
+ .fops = &osp_max_rpcs_in_flight_fops },
+ { .name = "max_rpcs_in_progress",
+ .fops = &osp_max_rpcs_in_prog_fops },
+ { .name = "timeouts",
+ .fops = &osp_timeouts_fops },
+ { .name = "import",
+ .fops = &osp_import_fops },
+ { .name = "state",
+ .fops = &osp_state_fops },
+ { .name = "maxage",
+ .fops = &osp_maxage_fops },
+ { .name = "prealloc_status",
+ .fops = &osp_pre_status_fops },
+
+ /* for compatibility reasons */
+ { .name = "destroys_in_flight",
+ .fops = &osp_destroys_in_flight_fops },
+ { .name = "lfsck_max_rpcs_in_flight",
+ .fops = &osp_lfsck_max_rpcs_in_flight_fops },
+ { NULL }
};
LPROC_SEQ_FOPS_RO_TYPE(osp, dt_blksize);
LPROC_SEQ_FOPS_RO_TYPE(osp, dt_filestotal);
LPROC_SEQ_FOPS_RO_TYPE(osp, dt_filesfree);
-static struct lprocfs_seq_vars lprocfs_osp_osd_vars[] = {
+static struct lprocfs_vars lprocfs_osp_osd_vars[] = {
{ .name = "blocksize",
.fops = &osp_dt_blksize_fops },
{ .name = "kbytestotal",
.fops = &osp_dt_filestotal_fops },
{ .name = "filesfree",
.fops = &osp_dt_filesfree_fops },
- { 0 }
+ { NULL }
};
/**
struct obd_type *type;
int rc;
- obd->obd_vars = lprocfs_osp_obd_vars;
+ if (osp->opd_connect_mdt)
+ obd->obd_vars = lprocfs_osp_md_vars;
+ else
+ obd->obd_vars = lprocfs_osp_obd_vars;
if (lprocfs_obd_setup(obd) != 0)
return;
- rc = lprocfs_seq_add_vars(obd->obd_proc_entry, lprocfs_osp_osd_vars,
- &osp->opd_dt_dev);
+ rc = lprocfs_add_vars(obd->obd_proc_entry, lprocfs_osp_osd_vars,
+ &osp->opd_dt_dev);
if (rc) {
CERROR("%s: can't register in lprocfs, rc %d\n",
obd->obd_name, rc);
return;
}
+ sptlrpc_lprocfs_cliobd_attach(obd);
ptlrpc_lprocfs_register_obd(obd);
if (osp->opd_connect_mdt || !strstr(obd->obd_name, "osc"))
osp->opd_symlink = lprocfs_add_symlink(obd->obd_name, osc_proc_dir,
"../osp/%s", obd->obd_name);
if (osp->opd_symlink == NULL)
- CERROR("could not register OSC symlink for "
- "/proc/fs/lustre/osp/%s.", obd->obd_name);
+ CERROR("cannot create OSC symlink for /proc/fs/lustre/osp/%s\n",
+ obd->obd_name);
}
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff