LU-13783 procfs: fix improper prop_ops fields

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

diff --git a/lustre/lmv/lproc_lmv.c b/lustre/lmv/lproc_lmv.c
index 981b032..feded16 100644 (file)
--- a/lustre/lmv/lproc_lmv.c
+++ b/lustre/lmv/lproc_lmv.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
@@ -42,36 +41,32 @@
 static ssize_t numobd_show(struct kobject *kobj, struct attribute *attr,
                           char *buf)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
-       struct lmv_desc *desc;
 
-        desc = &dev->u.lmv.desc;
-       return sprintf(buf, "%u\n", desc->ld_tgt_count);
+       return scnprintf(buf, PAGE_SIZE, "%u\n", obd->u.lmv.lmv_mdt_count);
 }
 LUSTRE_RO_ATTR(numobd);
 
 static ssize_t activeobd_show(struct kobject *kobj, struct attribute *attr,
                              char *buf)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
-       struct lmv_desc *desc;
 
-        desc = &dev->u.lmv.desc;
-       return sprintf(buf, "%u\n", desc->ld_active_tgt_count);
+       return scnprintf(buf, PAGE_SIZE, "%u\n",
+               obd->u.lmv.lmv_mdt_descs.ltd_lmv_desc.ld_active_tgt_count);
 }
 LUSTRE_RO_ATTR(activeobd);
 
 static ssize_t desc_uuid_show(struct kobject *kobj, struct attribute *attr,
                              char *buf)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
-       struct lmv_desc *desc;
 
-       desc = &dev->u.lmv.desc;
-       return sprintf(buf, "%s\n", desc->ld_uuid.uuid);
+       return scnprintf(buf, PAGE_SIZE, "%s\n",
+                       obd->u.lmv.lmv_mdt_descs.ltd_lmv_desc.ld_uuid.uuid);
 }
 LUSTRE_RO_ATTR(desc_uuid);
 
@@ -79,10 +74,11 @@ static ssize_t qos_maxage_show(struct kobject *kobj,
                               struct attribute *attr,
                               char *buf)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
 
-       return sprintf(buf, "%u\n", dev->u.lmv.desc.ld_qos_maxage);
+       return scnprintf(buf, PAGE_SIZE, "%u\n",
+                       obd->u.lmv.lmv_mdt_descs.ltd_lmv_desc.ld_qos_maxage);
 }
 
 static ssize_t qos_maxage_store(struct kobject *kobj,
@@ -90,7 +86,7 @@ static ssize_t qos_maxage_store(struct kobject *kobj,
                                const char *buffer,
                                size_t count)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
        unsigned int val;
        int rc;
@@ -99,7 +95,7 @@ static ssize_t qos_maxage_store(struct kobject *kobj,
        if (rc)
                return rc;
 
-       dev->u.lmv.desc.ld_qos_maxage = val;
+       obd->u.lmv.lmv_mdt_descs.ltd_lmv_desc.ld_qos_maxage = val;
 
        return count;
 }
@@ -109,11 +105,11 @@ static ssize_t qos_prio_free_show(struct kobject *kobj,
                                  struct attribute *attr,
                                  char *buf)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
 
-       return sprintf(buf, "%u%%\n",
-                      (dev->u.lmv.lmv_qos.lq_prio_free * 100 + 255) >> 8);
+       return scnprintf(buf, PAGE_SIZE, "%u%%\n",
+                       (obd->u.lmv.lmv_qos.lq_prio_free * 100 + 255) >> 8);
 }
 
 static ssize_t qos_prio_free_store(struct kobject *kobj,
@@ -121,9 +117,9 @@ static ssize_t qos_prio_free_store(struct kobject *kobj,
                                   const char *buffer,
                                   size_t count)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
-       struct lmv_obd *lmv = &dev->u.lmv;
+       struct lmv_obd *lmv = &obd->u.lmv;
        unsigned int val;
        int rc;
 
@@ -135,8 +131,8 @@ static ssize_t qos_prio_free_store(struct kobject *kobj,
                return -EINVAL;
 
        lmv->lmv_qos.lq_prio_free = (val << 8) / 100;
-       lmv->lmv_qos.lq_dirty = 1;
-       lmv->lmv_qos.lq_reset = 1;
+       set_bit(LQ_DIRTY, &lmv->lmv_qos.lq_flags);
+       set_bit(LQ_RESET, &lmv->lmv_qos.lq_flags);
 
        return count;
 }
@@ -146,11 +142,11 @@ static ssize_t qos_threshold_rr_show(struct kobject *kobj,
                                     struct attribute *attr,
                                     char *buf)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
 
-       return sprintf(buf, "%u%%\n",
-                      (dev->u.lmv.lmv_qos.lq_threshold_rr * 100 + 255) >> 8);
+       return scnprintf(buf, PAGE_SIZE, "%u%%\n",
+                       (obd->u.lmv.lmv_qos.lq_threshold_rr * 100 + 255) >> 8);
 }
 
 static ssize_t qos_threshold_rr_store(struct kobject *kobj,
@@ -158,9 +154,9 @@ static ssize_t qos_threshold_rr_store(struct kobject *kobj,
                                      const char *buffer,
                                      size_t count)
 {
-       struct obd_device *dev = container_of(kobj, struct obd_device,
+       struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
-       struct lmv_obd *lmv = &dev->u.lmv;
+       struct lmv_obd *lmv = &obd->u.lmv;
        unsigned int val;
        int rc;
 
@@ -172,7 +168,7 @@ static ssize_t qos_threshold_rr_store(struct kobject *kobj,
                return -EINVAL;
 
        lmv->lmv_qos.lq_threshold_rr = (val << 8) / 100;
-       lmv->lmv_qos.lq_dirty = 1;
+       set_bit(LQ_DIRTY, &lmv->lmv_qos.lq_flags);
 
        return count;
 }
@@ -181,16 +177,19 @@ LUSTRE_RW_ATTR(qos_threshold_rr);
 #ifdef CONFIG_PROC_FS
 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;
+       struct obd_device *obd = p->private;
+       struct lmv_obd *lmv = &obd->u.lmv;
+       struct lu_tgt_desc *tgt;
+
+       while (*pos < lmv->lmv_mdt_descs.ltd_tgts_size) {
+               tgt = lmv_tgt(lmv, (__u32)*pos);
+               if (tgt)
+                       return tgt;
 
-       while (*pos < lmv->tgts_size) {
-               if (lmv->tgts[*pos])
-                       return lmv->tgts[*pos];
                ++*pos;
        }
 
-       return  NULL;
+       return NULL;
 }
 
 static void lmv_tgt_seq_stop(struct seq_file *p, void *v)
@@ -199,17 +198,20 @@ static void lmv_tgt_seq_stop(struct seq_file *p, void *v)
 
 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;
+       struct obd_device *obd = p->private;
+       struct lmv_obd *lmv = &obd->u.lmv;
+       struct lu_tgt_desc *tgt;
 
        ++*pos;
-       while (*pos < lmv->tgts_size) {
-               if (lmv->tgts[*pos])
-                       return lmv->tgts[*pos];
+       while (*pos < lmv->lmv_mdt_descs.ltd_tgts_size) {
+               tgt = lmv_tgt(lmv, (__u32)*pos);
+               if (tgt)
+                       return tgt;
+
                ++*pos;
        }
 
-       return  NULL;
+       return NULL;
 }
 
 static int lmv_tgt_seq_show(struct seq_file *p, void *v)
@@ -246,12 +248,12 @@ static int lmv_target_seq_open(struct inode *inode, struct file *file)
        return 0;
 }
 
-static const struct file_operations lmv_proc_target_fops = {
-        .owner                = THIS_MODULE,
-        .open                 = lmv_target_seq_open,
-        .read                 = seq_read,
-        .llseek               = seq_lseek,
-        .release              = seq_release,
+static const struct proc_ops lmv_proc_target_fops = {
+       PROC_OWNER(THIS_MODULE)
+       .proc_open      = lmv_target_seq_open,
+       .proc_read      = seq_read,
+       .proc_lseek     = seq_lseek,
+       .proc_release   = seq_release,
 };
 #endif /* CONFIG_PROC_FS */