LU-8056 mem: handle GFP_IOFS removal in newer kernels

[fs/lustre-release.git] / lustre / osp / lproc_osp.c

diff --git a/lustre/osp/lproc_osp.c b/lustre/osp/lproc_osp.c
index cf0ee83..58fcb2d 100644 (file)
--- a/lustre/osp/lproc_osp.c
+++ b/lustre/osp/lproc_osp.c
@@ -73,11 +73,12 @@ static ssize_t
 osp_active_seq_write(struct file *file, const char __user *buffer,
                        size_t count, loff_t *off)
 {
-       struct seq_file   *m = file->private_data;
+       struct seq_file *m = file->private_data;
        struct obd_device *dev = m->private;
-       int                val, rc;
+       int rc;
+       __s64 val;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = lprocfs_str_to_s64(buffer, count, &val);
        if (rc)
                return rc;
        if (val < 0 || val > 1)
@@ -88,7 +89,7 @@ osp_active_seq_write(struct file *file, const char __user *buffer,
        if (dev->u.cli.cl_import->imp_deactive == val)
                rc = ptlrpc_set_import_active(dev->u.cli.cl_import, val);
        else
-               CDEBUG(D_CONFIG, "activate %d: ignoring repeat request\n",
+               CDEBUG(D_CONFIG, "activate "LPD64": ignoring repeat request\n",
                       val);
 
        LPROCFS_CLIMP_EXIT(dev);
@@ -112,7 +113,7 @@ static int osp_syn_in_flight_seq_show(struct seq_file *m, void *data)
        if (osp == NULL)
                return -EINVAL;
 
-       seq_printf(m, "%u\n", osp->opd_syn_rpc_in_flight);
+       seq_printf(m, "%u\n", atomic_read(&osp->opd_syn_rpc_in_flight));
        return 0;
 }
 LPROC_SEQ_FOPS_RO(osp_syn_in_flight);
@@ -133,7 +134,7 @@ static int osp_syn_in_prog_seq_show(struct seq_file *m, void *data)
        if (osp == NULL)
                return -EINVAL;
 
-       seq_printf(m, "%u\n", osp->opd_syn_rpc_in_progress);
+       seq_printf(m, "%u\n", atomic_read(&osp->opd_syn_rpc_in_progress));
        return 0;
 }
 LPROC_SEQ_FOPS_RO(osp_syn_in_prog);
@@ -154,7 +155,7 @@ static int osp_syn_changes_seq_show(struct seq_file *m, void *data)
        if (osp == NULL)
                return -EINVAL;
 
-       seq_printf(m, "%lu\n", osp->opd_syn_changes);
+       seq_printf(m, "%u\n", atomic_read(&osp->opd_syn_changes));
        return 0;
 }
 
@@ -223,19 +224,20 @@ static ssize_t
 osp_max_rpcs_in_flight_seq_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *off)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *dev = m->private;
-       struct osp_device       *osp = lu2osp_dev(dev->obd_lu_dev);
-       int                      val, rc;
+       struct seq_file *m = file->private_data;
+       struct obd_device *dev = m->private;
+       struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev);
+       int rc;
+       __s64 val;
 
        if (osp == NULL)
                return -EINVAL;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = lprocfs_str_to_s64(buffer, count, &val);
        if (rc)
                return rc;
 
-       if (val < 1)
+       if (val < 1 || val > INT_MAX)
                return -ERANGE;
 
        osp->opd_syn_max_rpc_in_flight = val;
@@ -277,19 +279,20 @@ static ssize_t
 osp_max_rpcs_in_prog_seq_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *off)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *dev = m->private;
-       struct osp_device       *osp = lu2osp_dev(dev->obd_lu_dev);
-       int                      val, rc;
+       struct seq_file *m = file->private_data;
+       struct obd_device *dev = m->private;
+       struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev);
+       int rc;
+       __s64 val;
 
        if (osp == NULL)
                return -EINVAL;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = lprocfs_str_to_s64(buffer, count, &val);
        if (rc)
                return rc;
 
-       if (val < 1)
+       if (val < 1 || val > INT_MAX)
                return -ERANGE;
 
        osp->opd_syn_max_rpc_in_progress = val;
@@ -332,15 +335,16 @@ static ssize_t
 osp_create_count_seq_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *off)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct osp_device       *osp = lu2osp_dev(obd->obd_lu_dev);
-       int                      val, rc, i;
+       struct seq_file *m = file->private_data;
+       struct obd_device *obd = m->private;
+       struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev);
+       int rc, i;
+       __s64 val;
 
        if (osp == NULL || osp->opd_pre == NULL)
                return 0;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = lprocfs_str_to_s64(buffer, count, &val);
        if (rc)
                return rc;
 
@@ -401,19 +405,20 @@ static ssize_t
 osp_max_create_count_seq_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *off)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct osp_device       *osp = lu2osp_dev(obd->obd_lu_dev);
-       int                      val, rc;
+       struct seq_file *m = file->private_data;
+       struct obd_device *obd = m->private;
+       struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev);
+       int rc;
+       __s64 val;
 
        if (osp == NULL || osp->opd_pre == NULL)
                return 0;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = lprocfs_str_to_s64(buffer, count, &val);
        if (rc)
                return rc;
 
-       if (val < 0)
+       if (val < 0 || val > INT_MAX)
                return -ERANGE;
        if (val > OST_MAX_PRECREATE)
                return -ERANGE;
@@ -567,19 +572,20 @@ static ssize_t
 osp_maxage_seq_write(struct file *file, const char __user *buffer,
                        size_t count, loff_t *off)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *dev = m->private;
-       struct osp_device       *osp = lu2osp_dev(dev->obd_lu_dev);
-       int                      val, rc;
+       struct seq_file *m = file->private_data;
+       struct obd_device *dev = m->private;
+       struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev);
+       int rc;
+       __s64 val;
 
        if (osp == NULL)
                return -EINVAL;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = lprocfs_str_to_s64(buffer, count, &val);
        if (rc)
                return rc;
 
-       if (val < 1)
+       if (val < 1 || val > INT_MAX)
                return -ERANGE;
 
        osp->opd_statfs_maxage = val;
@@ -633,8 +639,9 @@ static int osp_destroys_in_flight_seq_show(struct seq_file *m, void *data)
        if (osp == NULL)
                return -EINVAL;
 
-       seq_printf(m, "%lu\n",
-                  osp->opd_syn_rpc_in_progress + osp->opd_syn_changes);
+       seq_printf(m, "%u\n",
+                  atomic_read(&osp->opd_syn_rpc_in_progress) +
+                  atomic_read(&osp->opd_syn_changes));
        return 0;
 }
 LPROC_SEQ_FOPS_RO(osp_destroys_in_flight);
@@ -696,15 +703,18 @@ osp_lfsck_max_rpcs_in_flight_seq_write(struct file *file,
 {
        struct seq_file   *m = file->private_data;
        struct obd_device *dev = m->private;
-       int val;
+       __s64 val;
        int rc;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc == 0)
-               rc = obd_set_max_rpcs_in_flight(&dev->u.cli, val);
+       rc = lprocfs_str_to_s64(buffer, count, &val);
+       if (rc == 0) {
+               if (val < 0)
+                       return -ERANGE;
 
-       if (rc != 0)
+               rc = obd_set_max_rpcs_in_flight(&dev->u.cli, val);
+       } else {
                count = rc;
+       }
 
        return count;
 }