Revert "LU-3682 tunefs: prevent tunefs running on a mounted device"

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

diff --git a/lustre/ptlrpc/nrs.c b/lustre/ptlrpc/nrs.c
index f4700f8..a023a05 100644 (file)
--- a/lustre/ptlrpc/nrs.c
+++ b/lustre/ptlrpc/nrs.c
@@ -117,7 +117,7 @@ static void nrs_policy_stop0(struct ptlrpc_nrs_policy *policy)
        policy->pol_state = NRS_POL_STATE_STOPPED;
 
        if (cfs_atomic_dec_and_test(&policy->pol_desc->pd_refs))
-               cfs_module_put(policy->pol_desc->pd_owner);
+               module_put(policy->pol_desc->pd_owner);
 
        EXIT;
 }
@@ -259,7 +259,7 @@ static int nrs_policy_start_locked(struct ptlrpc_nrs_policy *policy)
         * modules.
         */
        if (cfs_atomic_inc_return(&policy->pol_desc->pd_refs) == 1 &&
-           !cfs_try_module_get(policy->pol_desc->pd_owner)) {
+           !try_module_get(policy->pol_desc->pd_owner)) {
                cfs_atomic_dec(&policy->pol_desc->pd_refs);
                CERROR("NRS: cannot get module for policy %s; is it alive?\n",
                       policy->pol_desc->pd_name);
@@ -281,7 +281,7 @@ static int nrs_policy_start_locked(struct ptlrpc_nrs_policy *policy)
                spin_lock(&nrs->nrs_lock);
                if (rc != 0) {
                        if (cfs_atomic_dec_and_test(&policy->pol_desc->pd_refs))
-                               cfs_module_put(policy->pol_desc->pd_owner);
+                               module_put(policy->pol_desc->pd_owner);
 
                        policy->pol_state = NRS_POL_STATE_STOPPED;
                        GOTO(out, rc);
@@ -769,7 +769,7 @@ static int nrs_policy_register(struct ptlrpc_nrs *nrs,
        LASSERT(desc->pd_compat != NULL);
 
        OBD_CPT_ALLOC_GFP(policy, svcpt->scp_service->srv_cptable,
-                         svcpt->scp_cpt, sizeof(*policy), CFS_ALLOC_IO);
+                         svcpt->scp_cpt, sizeof(*policy), __GFP_IO);
        if (policy == NULL)
                RETURN(-ENOMEM);
 
@@ -1744,6 +1744,9 @@ extern struct ptlrpc_nrs_pol_conf nrs_conf_fifo;
 #if defined HAVE_SERVER_SUPPORT && defined(__KERNEL__)
 /* ptlrpc/nrs_crr.c */
 extern struct ptlrpc_nrs_pol_conf nrs_conf_crrn;
+/* ptlrpc/nrs_orr.c */
+extern struct ptlrpc_nrs_pol_conf nrs_conf_orr;
+extern struct ptlrpc_nrs_pol_conf nrs_conf_trr;
 #endif
 
 /**
@@ -1769,6 +1772,14 @@ int ptlrpc_nrs_init(void)
        rc = ptlrpc_nrs_policy_register(&nrs_conf_crrn);
        if (rc != 0)
                GOTO(fail, rc);
+
+       rc = ptlrpc_nrs_policy_register(&nrs_conf_orr);
+       if (rc != 0)
+               GOTO(fail, rc);
+
+       rc = ptlrpc_nrs_policy_register(&nrs_conf_trr);
+       if (rc != 0)
+               GOTO(fail, rc);
 #endif
 
        RETURN(rc);