X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flov%2Flproc_lov.c;h=0fa460bf433933394e4991710a1151d12893f9a7;hp=d65c682f7881bb41587f3b3c956fa452c1050ad3;hb=9b444af6ad00c68d74ec70f01e1236d2d075eee1;hpb=efc75006b820c9b8e186c7650fc24edd5d0509af diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c index d65c682..0fa460b 100644 --- a/lustre/lov/lproc_lov.c +++ b/lustre/lov/lproc_lov.c @@ -3,37 +3,35 @@ * * Copyright (C) 2002 Cluster File Systems, Inc. * - * This file is part of Lustre, http://www.lustre.org. + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * If you did not agree to a different license, then this copy of Lustre + * is open source software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * In either case, Lustre is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license text for more details. * */ #define DEBUG_SUBSYSTEM S_CLASS #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) #include -#endif -#include -#include +#include +#include #include +#include "lov_internal.h" -#ifndef LPROCFS -static struct lprocfs_vars lprocfs_module_vars[] = { {0} }; -static struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; -#else - +#ifdef LPROCFS static int lov_rd_stripesize(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -46,6 +44,25 @@ static int lov_rd_stripesize(char *page, char **start, off_t off, int count, return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_size); } +static int lov_wr_stripesize(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_desc *desc; + __u64 val; + int rc; + + LASSERT(dev != NULL); + desc = &dev->u.lov.desc; + rc = lprocfs_write_u64_helper(buffer, count, &val); + if (rc) + return rc; + + desc->ld_default_stripe_size = val; + lov_fix_desc(desc); + return count; +} + static int lov_rd_stripeoffset(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -58,6 +75,25 @@ static int lov_rd_stripeoffset(char *page, char **start, off_t off, int count, return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_offset); } +static int lov_wr_stripeoffset(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_desc *desc; + __u64 val; + int rc; + + LASSERT(dev != NULL); + desc = &dev->u.lov.desc; + rc = lprocfs_write_u64_helper(buffer, count, &val); + if (rc) + return rc; + + desc->ld_default_stripe_offset = val; + lov_fix_desc(desc); + return count; +} + static int lov_rd_stripetype(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -70,6 +106,24 @@ static int lov_rd_stripetype(char *page, char **start, off_t off, int count, return snprintf(page, count, "%u\n", desc->ld_pattern); } +static int lov_wr_stripetype(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_desc *desc; + int val, rc; + + LASSERT(dev != NULL); + desc = &dev->u.lov.desc; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + desc->ld_pattern = val; + lov_fix_desc(desc); + return count; +} + static int lov_rd_stripecount(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -82,6 +136,24 @@ static int lov_rd_stripecount(char *page, char **start, off_t off, int count, return snprintf(page, count, "%u\n", desc->ld_default_stripe_count); } +static int lov_wr_stripecount(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_desc *desc; + int val, rc; + + LASSERT(dev != NULL); + desc = &dev->u.lov.desc; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + desc->ld_default_stripe_count = val; + lov_fix_desc(desc); + return count; +} + static int lov_rd_numobd(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -119,12 +191,78 @@ static int lov_rd_desc_uuid(char *page, char **start, off_t off, int count, return snprintf(page, count, "%s\n", lov->desc.ld_uuid.uuid); } +/* free priority (0-255): how badly user wants to choose empty osts */ +static int lov_rd_qos_priofree(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *dev = (struct obd_device*) data; + struct lov_obd *lov; + + LASSERT(dev != NULL); + lov = &dev->u.lov; + *eof = 1; + return snprintf(page, count, "%d%%\n", + (lov->lov_qos.lq_prio_free * 100) >> 8); +} + +static int lov_wr_qos_priofree(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_obd *lov; + int val, rc; + LASSERT(dev != NULL); + + lov = &dev->u.lov; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val > 100) + return -EINVAL; + lov->lov_qos.lq_prio_free = (val << 8) / 100; + lov->lov_qos.lq_dirty = 1; + lov->lov_qos.lq_reset = 1; + return count; +} + +static int lov_rd_qos_maxage(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *dev = (struct obd_device*) data; + struct lov_obd *lov; + + LASSERT(dev != NULL); + lov = &dev->u.lov; + *eof = 1; + return snprintf(page, count, "%u Sec\n", lov->desc.ld_qos_maxage); +} + +static int lov_wr_qos_maxage(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_obd *lov; + int val, rc; + LASSERT(dev != NULL); + + lov = &dev->u.lov; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val <= 0) + return -EINVAL; + lov->desc.ld_qos_maxage = val; + return count; +} + static void *lov_tgt_seq_start(struct seq_file *p, loff_t *pos) { struct obd_device *dev = p->private; struct lov_obd *lov = &dev->u.lov; - return (*pos >= lov->desc.ld_tgt_count) ? NULL : &(lov->tgts[*pos]); + return (*pos >= lov->desc.ld_tgt_count) ? NULL : lov->lov_tgts[*pos]; } @@ -137,18 +275,19 @@ static void *lov_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos) struct obd_device *dev = p->private; struct lov_obd *lov = &dev->u.lov; - ++*pos; - return (*pos >=lov->desc.ld_tgt_count) ? NULL : &(lov->tgts[*pos]); + while (++*pos < lov->desc.ld_tgt_count) { + if (lov->lov_tgts[*pos]) + return lov->lov_tgts[*pos]; + } + return NULL; } static int lov_tgt_seq_show(struct seq_file *p, void *v) { struct lov_tgt_desc *tgt = v; - struct obd_device *dev = p->private; - struct lov_obd *lov = &dev->u.lov; - int idx = tgt - &(lov->tgts[0]); - return seq_printf(p, "%d: %s %sACTIVE\n", idx+1, tgt->uuid.uuid, - tgt->active ? "" : "IN"); + return seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_index, + obd_uuid2str(&tgt->ltd_uuid), + tgt->ltd_active ? "" : "IN"); } struct seq_operations lov_tgt_sops = { @@ -162,32 +301,38 @@ static int lov_target_seq_open(struct inode *inode, struct file *file) { struct proc_dir_entry *dp = PDE(inode); struct seq_file *seq; - int rc = seq_open(file, &lov_tgt_sops); - - if (rc) + int rc; + + LPROCFS_ENTRY_AND_CHECK(dp); + rc = seq_open(file, &lov_tgt_sops); + if (rc) { + LPROCFS_EXIT(); return rc; + } seq = file->private_data; seq->private = dp->data; - return 0; } struct lprocfs_vars lprocfs_obd_vars[] = { { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "stripesize", lov_rd_stripesize, 0, 0 }, - { "stripeoffset", lov_rd_stripeoffset, 0, 0 }, - { "stripecount", lov_rd_stripecount, 0, 0 }, - { "stripetype", lov_rd_stripetype, 0, 0 }, + { "stripesize", lov_rd_stripesize, lov_wr_stripesize, 0 }, + { "stripeoffset", lov_rd_stripeoffset, lov_wr_stripeoffset, 0 }, + { "stripecount", lov_rd_stripecount, lov_wr_stripecount, 0 }, + { "stripetype", lov_rd_stripetype, lov_wr_stripetype, 0 }, { "numobd", lov_rd_numobd, 0, 0 }, { "activeobd", lov_rd_activeobd, 0, 0 }, { "filestotal", lprocfs_rd_filestotal, 0, 0 }, { "filesfree", lprocfs_rd_filesfree, 0, 0 }, - //{ "filegroups", lprocfs_rd_filegroups, 0, 0 }, + /*{ "filegroups", lprocfs_rd_filegroups, 0, 0 },*/ { "blocksize", lprocfs_rd_blksize, 0, 0 }, { "kbytestotal", lprocfs_rd_kbytestotal, 0, 0 }, { "kbytesfree", lprocfs_rd_kbytesfree, 0, 0 }, + { "kbytesavail", lprocfs_rd_kbytesavail, 0, 0 }, { "desc_uuid", lov_rd_desc_uuid, 0, 0 }, + { "qos_prio_free",lov_rd_qos_priofree, lov_wr_qos_priofree, 0 }, + { "qos_maxage", lov_rd_qos_maxage, lov_wr_qos_maxage, 0 }, { 0 } }; @@ -197,11 +342,12 @@ static struct lprocfs_vars lprocfs_module_vars[] = { }; struct file_operations lov_proc_target_fops = { - .open = lov_target_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, + .owner = THIS_MODULE, + .open = lov_target_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = lprocfs_seq_release, }; -#endif /* LPROCFS */ LPROCFS_INIT_VARS(lov, lprocfs_module_vars, lprocfs_obd_vars) +#endif /* LPROCFS */