LU-9855 lustre: rename obd_device variables to obd

[fs/lustre-release.git] / lustre / lov / lproc_lov.c

diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c
index 234eeb3..204e401 100644 (file)
--- a/lustre/lov/lproc_lov.c
+++ b/lustre/lov/lproc_lov.c
@@ -40,11 +40,11 @@
 
 static int lov_stripesize_seq_show(struct seq_file *m, void *v)
 {
-       struct obd_device *dev = (struct obd_device *)m->private;
+       struct obd_device *obd = (struct obd_device *)m->private;
        struct lov_desc *desc;
 
-       LASSERT(dev != NULL);
-       desc = &dev->u.lov.desc;
+       LASSERT(obd != NULL);
+       desc = &obd->u.lov.desc;
 
        seq_printf(m, "%llu\n", desc->ld_default_stripe_size);
        return 0;
@@ -55,14 +55,14 @@ static ssize_t lov_stripesize_seq_write(struct file *file,
                                        size_t count, loff_t *off)
 {
        struct seq_file *m = file->private_data;
-       struct obd_device *dev = m->private;
+       struct obd_device *obd = m->private;
        struct lov_desc *desc;
        char kernbuf[22] = "";
        u64 val;
        int rc;
 
-       LASSERT(dev != NULL);
-       desc = &dev->u.lov.desc;
+       LASSERT(obd != NULL);
+       desc = &obd->u.lov.desc;
 
        if (count >= sizeof(kernbuf))
                return -EINVAL;
@@ -85,9 +85,9 @@ LPROC_SEQ_FOPS(lov_stripesize);
 static ssize_t stripeoffset_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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
 
        return sprintf(buf, "%lld\n", desc->ld_default_stripe_offset);
 }
@@ -95,9 +95,9 @@ static ssize_t stripeoffset_show(struct kobject *kobj, struct attribute *attr,
 static ssize_t stripeoffset_store(struct kobject *kobj, struct attribute *attr,
                                  const char *buf, 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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
        long val;
        int rc;
 
@@ -116,9 +116,9 @@ LUSTRE_RW_ATTR(stripeoffset);
 static ssize_t stripetype_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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
 
        return sprintf(buf, "%u\n", desc->ld_pattern);
 }
@@ -126,9 +126,9 @@ static ssize_t stripetype_show(struct kobject *kobj, struct attribute *attr,
 static ssize_t stripetype_store(struct kobject *kobj, struct attribute *attr,
                                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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
        u32 pattern;
        int rc;
 
@@ -146,9 +146,9 @@ LUSTRE_RW_ATTR(stripetype);
 static ssize_t stripecount_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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
 
        return sprintf(buf, "%d\n",
                       (__s16)(desc->ld_default_stripe_count + 1) - 1);
@@ -157,9 +157,9 @@ static ssize_t stripecount_show(struct kobject *kobj, struct attribute *attr,
 static ssize_t stripecount_store(struct kobject *kobj, struct attribute *attr,
                                 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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
        int stripe_count;
        int rc;
 
@@ -180,9 +180,9 @@ LUSTRE_RW_ATTR(stripecount);
 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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
 
        return sprintf(buf, "%u\n", desc->ld_tgt_count);
 }
@@ -191,9 +191,9 @@ 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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
 
        return sprintf(buf, "%u\n", desc->ld_active_tgt_count);
 }
@@ -202,9 +202,9 @@ 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 lov_desc *desc = &dev->u.lov.desc;
+       struct lov_desc *desc = &obd->u.lov.desc;
 
        return sprintf(buf, "%s\n", desc->ld_uuid.uuid);
 }
@@ -213,15 +213,15 @@ LUSTRE_RO_ATTR(desc_uuid);
 #ifdef CONFIG_PROC_FS
 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;
-
-        while (*pos < lov->desc.ld_tgt_count) {
-                if (lov->lov_tgts[*pos])
-                        return lov->lov_tgts[*pos];
-                ++*pos;
-        }
-        return NULL;
+       struct obd_device *obd = p->private;
+       struct lov_obd *lov = &obd->u.lov;
+
+       while (*pos < lov->desc.ld_tgt_count) {
+               if (lov->lov_tgts[*pos])
+                       return lov->lov_tgts[*pos];
+               ++*pos;
+       }
+       return NULL;
 }
 
 static void lov_tgt_seq_stop(struct seq_file *p, void *v)
@@ -230,14 +230,14 @@ static void lov_tgt_seq_stop(struct seq_file *p, void *v)
 
 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;
-
-        while (++*pos < lov->desc.ld_tgt_count) {
-                if (lov->lov_tgts[*pos])
-                        return lov->lov_tgts[*pos];
-        }
-        return NULL;
+       struct obd_device *obd = p->private;
+       struct lov_obd *lov = &obd->u.lov;
+
+       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)