LU-8009 utils: Lustre_rsync does not sync files on MDT1

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

diff --git a/lustre/lmv/lproc_lmv.c b/lustre/lmv/lproc_lmv.c
index 26461c7..251dd93 100644 (file)
--- a/lustre/lmv/lproc_lmv.c
+++ b/lustre/lmv/lproc_lmv.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,7 +42,9 @@
 #include <lprocfs_status.h>
 #include <obd_class.h>
 
-#ifndef LPROCFS
+#include "lmv_internal.h"
+
+#ifndef CONFIG_PROC_FS
 static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
 #else
@@ -53,7 +55,8 @@ 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);
 
@@ -87,7 +90,8 @@ static int lmv_placement_seq_show(struct seq_file *m, void *v)
 
         LASSERT(dev != NULL);
         lmv = &dev->u.lmv;
-       return seq_printf(m, "%s\n", placement_policy2name(lmv->lmv_placement));
+       seq_printf(m, "%s\n", placement_policy2name(lmv->lmv_placement));
+       return 0;
 }
 
 #define MAX_POLICY_STRING_SIZE 64
@@ -135,7 +139,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);
 
@@ -146,7 +151,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);
 
@@ -176,11 +182,12 @@ 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;
 }
 
-struct seq_operations lmv_tgt_sops = {
+static const struct seq_operations lmv_tgt_sops = {
         .start                 = lmv_tgt_seq_start,
         .stop                  = lmv_tgt_seq_stop,
         .next                  = lmv_tgt_seq_next,
@@ -203,7 +210,7 @@ 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",
@@ -214,7 +221,7 @@ struct lprocfs_seq_vars lprocfs_lmv_obd_vars[] = {
          .fops =       &lmv_uuid_fops          },
        { .name =       "desc_uuid",
          .fops =       &lmv_desc_uuid_fops     },
-       { 0 }
+       { NULL }
 };
 
 struct file_operations lmv_proc_target_fops = {
@@ -224,4 +231,4 @@ struct file_operations lmv_proc_target_fops = {
         .llseek               = seq_lseek,
         .release              = seq_release,
 };
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */