b=21919 Do not resend quota_ctl requests

[fs/lustre-release.git] / lustre / mdc / lproc_mdc.c

diff --git a/lustre/mdc/lproc_mdc.c b/lustre/mdc/lproc_mdc.c
index 0258d5f..e78332d 100644 (file)
--- a/lustre/mdc/lproc_mdc.c
+++ b/lustre/mdc/lproc_mdc.c
@@ -151,16 +151,14 @@ static int lproc_mdc_wr_changelog(struct file *file, const char *buffer,
         struct changelog_show cs = {};
         int rc;
 
-        CDEBUG(D_CHANGELOG, "file pid %d\n", file->f_owner.pid);
-
         if (count != sizeof(cs))
                 return -EINVAL;
 
-        if (copy_from_user(&cs, buffer, sizeof(cs)))
+        if (cfs_copy_from_user(&cs, buffer, sizeof(cs)))
                 return -EFAULT;
 
-        CDEBUG(D_CHANGELOG, "changelog to pid=%d(%d) start "LPU64"\n",
-               cs.cs_pid, file->f_owner.pid, cs.cs_startrec);
+        CDEBUG(D_CHANGELOG, "changelog to pid=%d start "LPU64"\n",
+               cs.cs_pid, cs.cs_startrec);
 
         /* Set up the remote catalog handle */
         ctxt = llog_get_context(obd, LLOG_CHANGELOG_REPL_CTXT);
@@ -216,7 +214,7 @@ static int mdc_wr_netlink(struct file *file, const char *buffer,
         CWARN("message to pid %d\n", pid);
 
         len = sizeof(*lh) + sizeof(*hal) + MTI_NAME_MAXLEN +
-                /* for mockup below */ 2 * size_round(sizeof(*hai));
+                /* for mockup below */ 2 * cfs_size_round(sizeof(*hai));
 
         OBD_ALLOC(lh, len);
 
@@ -265,8 +263,6 @@ static struct lprocfs_vars lprocfs_mdc_obd_vars[] = {
         { "mds_conn_uuid",   lprocfs_rd_conn_uuid,   0, 0 },
         { "max_rpcs_in_flight", mdc_rd_max_rpcs_in_flight,
                                 mdc_wr_max_rpcs_in_flight, 0 },
-        { "quota_resend_count",  lprocfs_rd_quota_resend_count,
-                                 lprocfs_wr_quota_resend_count, 0},
         { "timeouts",        lprocfs_rd_timeouts,    0, 0 },
         { "import",          lprocfs_rd_import,      0, 0 },
         { "state",           lprocfs_rd_state,       0, 0 },