Revert "LU-6245 libcfs: remove cfs_fs_time handling"

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

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 528bed7..f935f8e 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, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -76,7 +76,7 @@ static int seq_client_rpc(struct lu_client_seq *seq,
 
        /* Zero out input range, this is not recovery yet. */
        in = req_capsule_client_get(&req->rq_pill, &RMF_SEQ_RANGE);
-       range_init(in);
+       lu_seq_range_init(in);
 
        ptlrpc_request_set_replen(req);
 
@@ -115,26 +115,21 @@ static int seq_client_rpc(struct lu_client_seq *seq,
 
        ptlrpc_at_set_req_timeout(req);
 
-       if (opc != SEQ_ALLOC_SUPER && seq->lcs_type == LUSTRE_SEQ_METADATA)
-               mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
-
        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);
 
        out = req_capsule_server_get(&req->rq_pill, &RMF_SEQ_RANGE);
        *output = *out;
 
-       if (!range_is_sane(output)) {
+       if (!lu_seq_range_is_sane(output)) {
                CERROR("%s: Invalid range received from server: "
                       DRANGE"\n", seq->lcs_name, PRANGE(output));
                GOTO(out_req, rc = -EINVAL);
        }
 
-       if (range_is_exhausted(output)) {
+       if (lu_seq_range_is_exhausted(output)) {
                CERROR("%s: Range received from server is exhausted: "
                       DRANGE"]\n", seq->lcs_name, PRANGE(output));
                GOTO(out_req, rc = -EINVAL);
@@ -213,12 +208,12 @@ static int seq_client_alloc_meta(const struct lu_env *env,
 static int seq_client_alloc_seq(const struct lu_env *env,
                                struct lu_client_seq *seq, u64 *seqnr)
 {
-        int rc;
-        ENTRY;
+       int rc;
+       ENTRY;
 
-        LASSERT(range_is_sane(&seq->lcs_space));
+       LASSERT(lu_seq_range_is_sane(&seq->lcs_space));
 
-        if (range_is_exhausted(&seq->lcs_space)) {
+       if (lu_seq_range_is_exhausted(&seq->lcs_space)) {
                 rc = seq_client_alloc_meta(env, seq);
                 if (rc) {
                         CERROR("%s: Can't allocate new meta-sequence,"
@@ -232,9 +227,9 @@ static int seq_client_alloc_seq(const struct lu_env *env,
                 rc = 0;
         }
 
-        LASSERT(!range_is_exhausted(&seq->lcs_space));
-        *seqnr = seq->lcs_space.lsr_start;
-        seq->lcs_space.lsr_start += 1;
+       LASSERT(!lu_seq_range_is_exhausted(&seq->lcs_space));
+       *seqnr = seq->lcs_space.lsr_start;
+       seq->lcs_space.lsr_start += 1;
 
         CDEBUG(D_INFO, "%s: Allocated sequence ["LPX64"]\n", seq->lcs_name,
                *seqnr);
@@ -419,7 +414,7 @@ void seq_client_flush(struct lu_client_seq *seq)
 
         seq->lcs_space.lsr_index = -1;
 
-        range_init(&seq->lcs_space);
+       lu_seq_range_init(&seq->lcs_space);
        mutex_unlock(&seq->lcs_mutex);
 }
 EXPORT_SYMBOL(seq_client_flush);
@@ -573,7 +568,7 @@ EXPORT_SYMBOL(client_fid_fini);
 
 struct proc_dir_entry *seq_type_proc_dir;
 
-static int __init fid_mod_init(void)
+static int __init fid_init(void)
 {
        seq_type_proc_dir = lprocfs_register(LUSTRE_SEQ_NAME,
                                             proc_lustre_root,
@@ -588,7 +583,7 @@ static int __init fid_mod_init(void)
        return 0;
 }
 
-static void __exit fid_mod_exit(void)
+static void __exit fid_exit(void)
 {
 # ifdef HAVE_SERVER_SUPPORT
        fid_server_mod_exit();
@@ -600,10 +595,10 @@ static void __exit fid_mod_exit(void)
        }
 }
 
-MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre FID Module");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
+MODULE_DESCRIPTION("Lustre File IDentifier");
 MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");
 
-module_init(fid_mod_init);
-module_exit(fid_mod_exit);
+module_init(fid_init);
+module_exit(fid_exit);