LU-2435 osd-zfs: use zfs native dnode accounting

[fs/lustre-release.git] / lustre / osd-zfs / osd_lproc.c

diff --git a/lustre/osd-zfs/osd_lproc.c b/lustre/osd-zfs/osd_lproc.c
index c48638a..88c1600 100644 (file)
--- a/lustre/osd-zfs/osd_lproc.c
+++ b/lustre/osd-zfs/osd_lproc.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -93,12 +89,12 @@ static void display_brw_stats(struct seq_file *seq, char *name, char *units,
 
 static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
 {
-       struct timeval now;
+       struct timespec64 now;
 
        /* this sampling races with updates */
-       do_gettimeofday(&now);
-       seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
-                  now.tv_sec, now.tv_usec);
+       ktime_get_real_ts64(&now);
+       seq_printf(seq, "snapshot_time:         %llu.%09lu (secs.nsecs)\n",
+                  (s64)now.tv_sec, now.tv_nsec);
 
        display_brw_stats(seq, "pages per bulk r/w", "rpcs",
                          &brw_stats->hist[BRW_R_PAGES],
@@ -139,7 +135,8 @@ static int osd_brw_stats_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static ssize_t osd_brw_stats_seq_write(struct file *file, const char *buf,
+static ssize_t osd_brw_stats_seq_write(struct file *file,
+                                      const char __user *buf,
                                       size_t len, loff_t *off)
 {
        struct seq_file *seq = file->private_data;
@@ -216,7 +213,8 @@ out:
 
 static int zfs_osd_fstype_seq_show(struct seq_file *m, void *data)
 {
-       return seq_printf(m, "zfs\n");
+       seq_puts(m, "zfs\n");
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(zfs_osd_fstype);
 
@@ -225,7 +223,8 @@ static int zfs_osd_mntdev_seq_show(struct seq_file *m, void *data)
        struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
 
        LASSERT(osd != NULL);
-       return seq_printf(m, "%s\n", osd->od_mntdev);
+       seq_printf(m, "%s\n", osd->od_mntdev);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(zfs_osd_mntdev);
 
@@ -248,35 +247,6 @@ lprocfs_osd_force_sync_seq_write(struct file *file, const char __user *buffer,
 }
 LPROC_SEQ_FOPS_WO_TYPE(zfs, osd_force_sync);
 
-static int zfs_osd_iused_est_seq_show(struct seq_file *m, void *data)
-{
-       struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
-       LASSERT(osd != NULL);
-
-       return seq_printf(m, "%d\n", osd->od_quota_iused_est);
-}
-
-static ssize_t
-zfs_osd_iused_est_seq_write(struct file *file, const char __user *buffer,
-                            size_t count, loff_t *off)
-{
-       struct seq_file   *m = file->private_data;
-       struct dt_device  *dt = m->private;
-       struct osd_device *osd = osd_dt_dev(dt);
-       int                rc, val;
-
-       LASSERT(osd != NULL);
-
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc)
-               return rc;
-
-       osd->od_quota_iused_est = !!val;
-
-       return count;
-}
-LPROC_SEQ_FOPS(zfs_osd_iused_est);
-
 LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_blksize);
 LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytestotal);
 LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytesfree);
@@ -303,8 +273,6 @@ struct lprocfs_vars lprocfs_osd_obd_vars[] = {
          .fops =       &zfs_osd_mntdev_fops            },
        { .name =       "force_sync",
          .fops =       &zfs_osd_force_sync_fops        },
-       { .name =       "quota_iused_estimate",
-         .fops =       &zfs_osd_iused_est_fops         },
        { 0 }
 };