LU-8066 llite: move /proc/fs/lustre/llite/stats_track* to

 sysfs

Move stats_track_pid, stats_track_ppid and stats_track_gid files
from /proc/fs/lustre/llite/* to /sys/fs/lustre/llite/*/

This is a modified version of

Linux-commit: 62cf4b1315e86a1f373f77acf32a23d76428ba27

due to the large amount of changes to the OpenSFS/Intel branch.

Test-Parameters: trivial

Change-Id: I29dc2dd269f66e40a7d016ba366353ae2ca7fb51
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/32503
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c
index 66d0f11..83c9e74 100644 (file)
--- a/lustre/llite/lproc_llite.c
+++ b/lustre/llite/lproc_llite.c
@@ -622,82 +622,88 @@ static ssize_t checksum_pages_store(struct kobject *kobj,
 }
 LUSTRE_RW_ATTR(checksum_pages);
 
-static int ll_rd_track_id(struct seq_file *m, enum stats_track_type type)
+static ssize_t ll_rd_track_id(struct kobject *kobj, char *buf,
+                             enum stats_track_type type)
 {
-       struct super_block *sb = m->private;
+       struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
+                                             ll_kset.kobj);
 
-       if (ll_s2sbi(sb)->ll_stats_track_type == type) {
-               seq_printf(m, "%d\n",
-                          ll_s2sbi(sb)->ll_stats_track_id);
-       } else if (ll_s2sbi(sb)->ll_stats_track_type == STATS_TRACK_ALL) {
-               seq_puts(m, "0 (all)\n");
-       } else {
-               seq_puts(m, "untracked\n");
-       }
-       return 0;
+       if (sbi->ll_stats_track_type == type)
+               return sprintf(buf, "%d\n", sbi->ll_stats_track_id);
+       else if (sbi->ll_stats_track_type == STATS_TRACK_ALL)
+               return sprintf(buf, "0 (all)\n");
+
+       return sprintf(buf, "untracked\n");
 }
 
-static int ll_wr_track_id(const char __user *buffer, unsigned long count,
-                         void *data, enum stats_track_type type)
+static ssize_t ll_wr_track_id(struct kobject *kobj, const char *buffer,
+                             size_t count, enum stats_track_type type)
 {
-       struct super_block *sb = data;
-       unsigned int pid;
+       struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
+                                             ll_kset.kobj);
+       unsigned long pid;
        int rc;
 
-       rc = kstrtouint_from_user(buffer, count, 0, &pid);
+       rc = kstrtoul(buffer, 10, &pid);
        if (rc)
                return rc;
 
-       ll_s2sbi(sb)->ll_stats_track_id = pid;
+       sbi->ll_stats_track_id = pid;
        if (pid == 0)
-               ll_s2sbi(sb)->ll_stats_track_type = STATS_TRACK_ALL;
+               sbi->ll_stats_track_type = STATS_TRACK_ALL;
        else
-               ll_s2sbi(sb)->ll_stats_track_type = type;
-       lprocfs_clear_stats(ll_s2sbi(sb)->ll_stats);
+               sbi->ll_stats_track_type = type;
+       lprocfs_clear_stats(sbi->ll_stats);
        return count;
 }
 
-static int ll_track_pid_seq_show(struct seq_file *m, void *v)
+static ssize_t stats_track_pid_show(struct kobject *kobj,
+                                   struct attribute *attr,
+                                   char *buf)
 {
-       return ll_rd_track_id(m, STATS_TRACK_PID);
+       return ll_rd_track_id(kobj, buf, STATS_TRACK_PID);
 }
 
-static ssize_t ll_track_pid_seq_write(struct file *file,
-                                     const char __user *buffer,
-                                     size_t count, loff_t *off)
+static ssize_t stats_track_pid_store(struct kobject *kobj,
+                                    struct attribute *attr,
+                                    const char *buffer,
+                                    size_t count)
 {
-       struct seq_file *seq = file->private_data;
-       return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_PID);
+       return ll_wr_track_id(kobj, buffer, count, STATS_TRACK_PID);
 }
-LPROC_SEQ_FOPS(ll_track_pid);
+LUSTRE_RW_ATTR(stats_track_pid);
 
-static int ll_track_ppid_seq_show(struct seq_file *m, void *v)
+static ssize_t stats_track_ppid_show(struct kobject *kobj,
+                                    struct attribute *attr,
+                                    char *buf)
 {
-       return ll_rd_track_id(m, STATS_TRACK_PPID);
+       return ll_rd_track_id(kobj, buf, STATS_TRACK_PPID);
 }
 
-static ssize_t ll_track_ppid_seq_write(struct file *file,
-                                      const char __user *buffer,
-                                      size_t count, loff_t *off)
+static ssize_t stats_track_ppid_store(struct kobject *kobj,
+                                     struct attribute *attr,
+                                     const char *buffer,
+                                     size_t count)
 {
-       struct seq_file *seq = file->private_data;
-       return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_PPID);
+       return ll_wr_track_id(kobj, buffer, count, STATS_TRACK_PPID);
 }
-LPROC_SEQ_FOPS(ll_track_ppid);
+LUSTRE_RW_ATTR(stats_track_ppid);
 
-static int ll_track_gid_seq_show(struct seq_file *m, void *v)
+static ssize_t stats_track_gid_show(struct kobject *kobj,
+                                   struct attribute *attr,
+                                   char *buf)
 {
-       return ll_rd_track_id(m, STATS_TRACK_GID);
+       return ll_rd_track_id(kobj, buf, STATS_TRACK_GID);
 }
 
-static ssize_t ll_track_gid_seq_write(struct file *file,
-                                     const char __user *buffer,
-                                     size_t count, loff_t *off)
+static ssize_t stats_track_gid_store(struct kobject *kobj,
+                                    struct attribute *attr,
+                                    const char *buffer,
+                                    size_t count)
 {
-       struct seq_file *seq = file->private_data;
-       return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_GID);
+       return ll_wr_track_id(kobj, buffer, count, STATS_TRACK_GID);
 }
-LPROC_SEQ_FOPS(ll_track_gid);
+LUSTRE_RW_ATTR(stats_track_gid);
 
 static ssize_t statahead_running_max_show(struct kobject *kobj,
                                          struct attribute *attr,
@@ -1184,12 +1190,6 @@ struct lprocfs_vars lprocfs_llite_obd_vars[] = {
          .fops =       &ll_max_read_ahead_whole_mb_fops        },
        { .name =       "max_cached_mb",
          .fops =       &ll_max_cached_mb_fops                  },
-       { .name =       "stats_track_pid",
-         .fops =       &ll_track_pid_fops                      },
-       { .name =       "stats_track_ppid",
-         .fops =       &ll_track_ppid_fops                     },
-       { .name =       "stats_track_gid",
-         .fops =       &ll_track_gid_fops                      },
        { .name =       "statahead_max",
          .fops =       &ll_statahead_max_fops                  },
        { .name =       "statahead_agl",
@@ -1234,6 +1234,9 @@ static struct attribute *llite_attrs[] = {
        &lustre_attr_fstype.attr,
        &lustre_attr_uuid.attr,
        &lustre_attr_checksum_pages.attr,
+       &lustre_attr_stats_track_pid.attr,
+       &lustre_attr_stats_track_ppid.attr,
+       &lustre_attr_stats_track_gid.attr,
        &lustre_attr_statahead_running_max.attr,
        NULL,
 };