LU-6124 test: skip tests require remote server with nodsh set

[fs/lustre-release.git] / lustre / fid / fid_request.c

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 520cc63..8cb64f1 100644 (file)
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -110,15 +110,13 @@ static int seq_client_rpc(struct lu_client_seq *seq,
                debug_mask = D_INFO;
        }
 
-       ptlrpc_at_set_req_timeout(req);
+       /* Allow seq client RPC during recovery time. */
+       req->rq_allow_replay = 1;
 
-       if (opc != SEQ_ALLOC_SUPER && seq->lcs_type == LUSTRE_SEQ_METADATA)
-               mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
+       ptlrpc_at_set_req_timeout(req);
 
        rc = ptlrpc_queue_wait(req);
 
-       if (opc != SEQ_ALLOC_SUPER && seq->lcs_type == LUSTRE_SEQ_METADATA)
-               mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
        if (rc)
                GOTO(out_req, rc);
 
@@ -247,7 +245,7 @@ static int seq_fid_alloc_prep(struct lu_client_seq *seq,
                set_current_state(TASK_UNINTERRUPTIBLE);
                mutex_unlock(&seq->lcs_mutex);
 
-               waitq_wait(link, TASK_UNINTERRUPTIBLE);
+               schedule();
 
                mutex_lock(&seq->lcs_mutex);
                remove_wait_queue(&seq->lcs_waitq, link);
@@ -278,7 +276,7 @@ int seq_client_get_seq(const struct lu_env *env,
 
        LASSERT(seqnr != NULL);
        mutex_lock(&seq->lcs_mutex);
-       init_waitqueue_entry_current(&link);
+       init_waitqueue_entry(&link, current);
 
         while (1) {
                 rc = seq_fid_alloc_prep(seq, &link);
@@ -329,7 +327,7 @@ int seq_client_alloc_fid(const struct lu_env *env,
        LASSERT(seq != NULL);
        LASSERT(fid != NULL);
 
-       init_waitqueue_entry_current(&link);
+       init_waitqueue_entry(&link, current);
        mutex_lock(&seq->lcs_mutex);
 
        if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_EXHAUST))
@@ -393,7 +391,7 @@ void seq_client_flush(struct lu_client_seq *seq)
        wait_queue_t link;
 
        LASSERT(seq != NULL);
-       init_waitqueue_entry_current(&link);
+       init_waitqueue_entry(&link, current);
        mutex_lock(&seq->lcs_mutex);
 
        while (seq->lcs_update) {
@@ -401,7 +399,7 @@ void seq_client_flush(struct lu_client_seq *seq)
                set_current_state(TASK_UNINTERRUPTIBLE);
                mutex_unlock(&seq->lcs_mutex);
 
-               waitq_wait(&link, TASK_UNINTERRUPTIBLE);
+               schedule();
 
                mutex_lock(&seq->lcs_mutex);
                remove_wait_queue(&seq->lcs_waitq, &link);
@@ -423,7 +421,7 @@ EXPORT_SYMBOL(seq_client_flush);
 
 static void seq_client_proc_fini(struct lu_client_seq *seq)
 {
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
        ENTRY;
        if (seq->lcs_proc_dir) {
                if (!IS_ERR(seq->lcs_proc_dir))
@@ -431,18 +429,17 @@ static void seq_client_proc_fini(struct lu_client_seq *seq)
                seq->lcs_proc_dir = NULL;
        }
        EXIT;
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */
 }
 
 static int seq_client_proc_init(struct lu_client_seq *seq)
 {
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
         int rc;
         ENTRY;
 
-       seq->lcs_proc_dir = lprocfs_seq_register(seq->lcs_name,
-                                                seq_type_proc_dir,
-                                                NULL, NULL);
+       seq->lcs_proc_dir = lprocfs_register(seq->lcs_name, seq_type_proc_dir,
+                                            NULL, NULL);
         if (IS_ERR(seq->lcs_proc_dir)) {
                 CERROR("%s: LProcFS failed in seq-init\n",
                        seq->lcs_name);
@@ -450,8 +447,7 @@ static int seq_client_proc_init(struct lu_client_seq *seq)
                 RETURN(rc);
         }
 
-       rc = lprocfs_seq_add_vars(seq->lcs_proc_dir,
-                                 seq_client_proc_list, seq);
+       rc = lprocfs_add_vars(seq->lcs_proc_dir, seq_client_proc_list, seq);
         if (rc) {
                 CERROR("%s: Can't init sequence manager "
                        "proc, rc %d\n", seq->lcs_name, rc);
@@ -464,9 +460,9 @@ out_cleanup:
         seq_client_proc_fini(seq);
         return rc;
 
-#else /* LPROCFS */
+#else /* !CONFIG_PROC_FS */
        return 0;
-#endif
+#endif /* CONFIG_PROC_FS */
 }
 
 int seq_client_init(struct lu_client_seq *seq,
@@ -574,9 +570,9 @@ struct proc_dir_entry *seq_type_proc_dir;
 
 static int __init fid_mod_init(void)
 {
-       seq_type_proc_dir = lprocfs_seq_register(LUSTRE_SEQ_NAME,
-                                                proc_lustre_root,
-                                                NULL, NULL);
+       seq_type_proc_dir = lprocfs_register(LUSTRE_SEQ_NAME,
+                                            proc_lustre_root,
+                                            NULL, NULL);
        if (IS_ERR(seq_type_proc_dir))
                return PTR_ERR(seq_type_proc_dir);
 
@@ -601,6 +597,8 @@ static void __exit fid_mod_exit(void)
 
 MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre FID Module");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");
 
-cfs_module(fid, "0.1.0", fid_mod_init, fid_mod_exit);
+module_init(fid_mod_init);
+module_exit(fid_mod_exit);