LU-3373 llite: instantiate negative dentry

[fs/lustre-release.git] / lustre / ptlrpc / nrs_crr.c

diff --git a/lustre/ptlrpc/nrs_crr.c b/lustre/ptlrpc/nrs_crr.c
index 6545913..134b88e 100644 (file)
--- a/lustre/ptlrpc/nrs_crr.c
+++ b/lustre/ptlrpc/nrs_crr.c
@@ -352,8 +352,8 @@ int nrs_crrn_res_get(struct ptlrpc_nrs_policy *policy,
                goto out;
 
        OBD_CPT_ALLOC_GFP(cli, nrs_pol2cptab(policy), nrs_pol2cptid(policy),
-                         sizeof(*cli), moving_req ? CFS_ALLOC_ATOMIC :
-                         CFS_ALLOC_IO);
+                         sizeof(*cli), moving_req ? GFP_ATOMIC :
+                         __GFP_IO);
        if (cli == NULL)
                return -ENOMEM;
 
@@ -718,14 +718,14 @@ static int ptlrpc_lprocfs_wr_nrs_crrn_quantum(struct file *file,
        long                         quantum_reg;
        long                         quantum_hp;
        /** lprocfs_find_named_value() modifies its argument, so keep a copy */
-       unsigned long                count_copy;
+       size_t                       count_copy;
        int                          rc = 0;
        int                          rc2 = 0;
 
         if (count > (sizeof(kernbuf) - 1))
                 return -EINVAL;
 
-       if (cfs_copy_from_user(kernbuf, buffer, count))
+       if (copy_from_user(kernbuf, buffer, count))
                return -EFAULT;
 
         kernbuf[count] = '\0';