LU-7674 lmv: remove unused placement parameter

[fs/lustre-release.git] / lustre / lmv / lproc_lmv.c

diff --git a/lustre/lmv/lproc_lmv.c b/lustre/lmv/lproc_lmv.c
index 352a578..b2c4070 100644 (file)
--- a/lustre/lmv/lproc_lmv.c
+++ b/lustre/lmv/lproc_lmv.c
@@ -44,7 +44,7 @@
 
 #include "lmv_internal.h"
 
-#ifndef LPROCFS
+#ifndef CONFIG_PROC_FS
 static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
 #else
@@ -55,81 +55,11 @@ static int lmv_numobd_seq_show(struct seq_file *m, void *v)
 
         LASSERT(dev != NULL);
         desc = &dev->u.lmv.desc;
-       return seq_printf(m, "%u\n", desc->ld_tgt_count);
+       seq_printf(m, "%u\n", desc->ld_tgt_count);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(lmv_numobd);
 
-static const char *placement_name[] = {
-        [PLACEMENT_CHAR_POLICY] = "CHAR",
-       [PLACEMENT_NID_POLICY]  = "NID",
-       [PLACEMENT_INVAL_POLICY]  = "INVAL"
-};
-
-static placement_policy_t placement_name2policy(char *name, int len)
-{
-        int                     i;
-
-        for (i = 0; i < PLACEMENT_MAX_POLICY; i++) {
-                if (!strncmp(placement_name[i], name, len))
-                        return i;
-        }
-        return PLACEMENT_INVAL_POLICY;
-}
-
-static const char *placement_policy2name(placement_policy_t placement)
-{
-        LASSERT(placement < PLACEMENT_MAX_POLICY);
-        return placement_name[placement];
-}
-
-static int lmv_placement_seq_show(struct seq_file *m, void *v)
-{
-       struct obd_device       *dev = (struct obd_device *)m->private;
-        struct lmv_obd          *lmv;
-
-        LASSERT(dev != NULL);
-        lmv = &dev->u.lmv;
-       return seq_printf(m, "%s\n", placement_policy2name(lmv->lmv_placement));
-}
-
-#define MAX_POLICY_STRING_SIZE 64
-
-static ssize_t lmv_placement_seq_write(struct file *file,
-                                      const char __user *buffer,
-                                      size_t count, loff_t *off)
-{
-       struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
-        char                     dummy[MAX_POLICY_STRING_SIZE + 1];
-        int                      len = count;
-        placement_policy_t       policy;
-        struct lmv_obd          *lmv;
-
-       if (copy_from_user(dummy, buffer, MAX_POLICY_STRING_SIZE))
-                return -EFAULT;
-
-        LASSERT(dev != NULL);
-        lmv = &dev->u.lmv;
-
-        if (len > MAX_POLICY_STRING_SIZE)
-                len = MAX_POLICY_STRING_SIZE;
-
-        if (dummy[len - 1] == '\n')
-                len--;
-        dummy[len] = '\0';
-
-        policy = placement_name2policy(dummy, len);
-        if (policy != PLACEMENT_INVAL_POLICY) {
-               spin_lock(&lmv->lmv_lock);
-               lmv->lmv_placement = policy;
-               spin_unlock(&lmv->lmv_lock);
-        } else {
-                CERROR("Invalid placement policy \"%s\"!\n", dummy);
-                return -EINVAL;
-        }
-        return count;
-}
-LPROC_SEQ_FOPS(lmv_placement);
-
 static int lmv_activeobd_seq_show(struct seq_file *m, void *v)
 {
        struct obd_device       *dev = (struct obd_device *)m->private;
@@ -137,7 +67,8 @@ static int lmv_activeobd_seq_show(struct seq_file *m, void *v)
 
         LASSERT(dev != NULL);
         desc = &dev->u.lmv.desc;
-       return seq_printf(m, "%u\n", desc->ld_active_tgt_count);
+       seq_printf(m, "%u\n", desc->ld_active_tgt_count);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(lmv_activeobd);
 
@@ -148,7 +79,8 @@ static int lmv_desc_uuid_seq_show(struct seq_file *m, void *v)
 
         LASSERT(dev != NULL);
         lmv = &dev->u.lmv;
-       return seq_printf(m, "%s\n", lmv->desc.ld_uuid.uuid);
+       seq_printf(m, "%s\n", lmv->desc.ld_uuid.uuid);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(lmv_desc_uuid);
 
@@ -156,7 +88,15 @@ static void *lmv_tgt_seq_start(struct seq_file *p, loff_t *pos)
 {
        struct obd_device       *dev = p->private;
        struct lmv_obd          *lmv = &dev->u.lmv;
-       return (*pos >= lmv->desc.ld_tgt_count) ? NULL : lmv->tgts[*pos];
+
+       while (*pos < lmv->tgts_size) {
+               if (lmv->tgts[*pos] != NULL)
+                       return lmv->tgts[*pos];
+
+               ++*pos;
+       }
+
+       return  NULL;
 }
 
 static void lmv_tgt_seq_stop(struct seq_file *p, void *v)
@@ -168,8 +108,16 @@ static void *lmv_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos)
 {
        struct obd_device       *dev = p->private;
        struct lmv_obd          *lmv = &dev->u.lmv;
+
        ++*pos;
-       return (*pos >= lmv->desc.ld_tgt_count) ? NULL : lmv->tgts[*pos];
+       while (*pos < lmv->tgts_size) {
+               if (lmv->tgts[*pos] != NULL)
+                       return lmv->tgts[*pos];
+
+               ++*pos;
+       }
+
+       return  NULL;
 }
 
 static int lmv_tgt_seq_show(struct seq_file *p, void *v)
@@ -178,8 +126,9 @@ static int lmv_tgt_seq_show(struct seq_file *p, void *v)
 
        if (tgt == NULL)
                return 0;
-       return seq_printf(p, "%u: %s %sACTIVE\n", tgt->ltd_idx,
-                         tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
+       seq_printf(p, "%u: %s %sACTIVE\n", tgt->ltd_idx,
+                 tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
+       return 0;
 }
 
 static const struct seq_operations lmv_tgt_sops = {
@@ -205,18 +154,16 @@ static int lmv_target_seq_open(struct inode *inode, struct file *file)
 
 LPROC_SEQ_FOPS_RO_TYPE(lmv, uuid);
 
-struct lprocfs_seq_vars lprocfs_lmv_obd_vars[] = {
+struct lprocfs_vars lprocfs_lmv_obd_vars[] = {
        { .name =       "numobd",
          .fops =       &lmv_numobd_fops        },
-       { .name =       "placement",
-         .fops =       &lmv_placement_fops     },
        { .name =       "activeobd",
          .fops =       &lmv_activeobd_fops     },
        { .name =       "uuid",
          .fops =       &lmv_uuid_fops          },
        { .name =       "desc_uuid",
          .fops =       &lmv_desc_uuid_fops     },
-       { 0 }
+       { NULL }
 };
 
 struct file_operations lmv_proc_target_fops = {
@@ -226,4 +173,4 @@ struct file_operations lmv_proc_target_fops = {
         .llseek               = seq_lseek,
         .release              = seq_release,
 };
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */